mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-07-05 10:59:35 +02:00
Merged revisions 49161 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq ........ r49161 | ischommer | 2008-02-07 14:25:07 +1300 (Thu, 07 Feb 2008) | 1 line avoid double escaping through attr*() and raw2att in createTag() ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52407 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
15b3fb02b4
commit
4f46aff087
|
@ -48,8 +48,8 @@ class AjaxUniqueTextField extends TextField {
|
||||||
'type' => 'text',
|
'type' => 'text',
|
||||||
'class' => $this->extraClass() . " text",
|
'class' => $this->extraClass() . " text",
|
||||||
'id' => $this->id(),
|
'id' => $this->id(),
|
||||||
'name' => $this->attrName(),
|
'name' => $this->Name(),
|
||||||
'value' => $this->attrValue(),
|
'value' => $this->Value(),
|
||||||
'tabindex' => $this->getTabIndexHTML(),
|
'tabindex' => $this->getTabIndexHTML(),
|
||||||
'maxlength' => ($this->maxLength) ? $this->maxLength : null
|
'maxlength' => ($this->maxLength) ? $this->maxLength : null
|
||||||
);
|
);
|
||||||
|
|
|
@ -33,7 +33,7 @@ class AutocompleteTextField extends TextField {
|
||||||
'type' => 'text',
|
'type' => 'text',
|
||||||
'id' => $this->id(),
|
'id' => $this->id(),
|
||||||
'name' => $this->name,
|
'name' => $this->name,
|
||||||
'value' => $this->attrValue(),
|
'value' => $this->Value(),
|
||||||
'tabindex' => $this->getTabIndexHTML(),
|
'tabindex' => $this->getTabIndexHTML(),
|
||||||
'size' => $this->maxLength ? min( $this->maxLength, 30 ) : 30
|
'size' => $this->maxLength ? min( $this->maxLength, 30 ) : 30
|
||||||
);
|
);
|
||||||
|
|
|
@ -24,7 +24,7 @@ class CheckboxField extends FormField {
|
||||||
'type' => 'checkbox',
|
'type' => 'checkbox',
|
||||||
'class' => $this->extraClass(),
|
'class' => $this->extraClass(),
|
||||||
'id' => $this->id(),
|
'id' => $this->id(),
|
||||||
'name' => $this->attrName(),
|
'name' => $this->Name(),
|
||||||
'value' => 1,
|
'value' => 1,
|
||||||
'tabindex' => $this->getTabIndexHTML(),
|
'tabindex' => $this->getTabIndexHTML(),
|
||||||
'checked' => $this->value ? "checked=\"checked\"" : '',
|
'checked' => $this->value ? "checked=\"checked\"" : '',
|
||||||
|
|
|
@ -19,7 +19,7 @@ class CheckboxFieldDisabled extends CheckboxField {
|
||||||
'type' => 'checkbox',
|
'type' => 'checkbox',
|
||||||
'class' => $this->extraClass() . " text",
|
'class' => $this->extraClass() . " text",
|
||||||
'id' => $this->id(),
|
'id' => $this->id(),
|
||||||
'name' => $this->attrName(),
|
'name' => $this->Name(),
|
||||||
'tabindex' => $this->getTabIndexHTML(),
|
'tabindex' => $this->getTabIndexHTML(),
|
||||||
'checked' => ($this->value) ? 'checked' : false,
|
'checked' => ($this->value) ? 'checked' : false,
|
||||||
'disabled' => 'disabled'
|
'disabled' => 'disabled'
|
||||||
|
|
|
@ -30,7 +30,7 @@ class ConfirmedFormAction extends FormAction {
|
||||||
'type' => 'submit',
|
'type' => 'submit',
|
||||||
'class' => $this->extraClass(),
|
'class' => $this->extraClass(),
|
||||||
'id' => $this->id(),
|
'id' => $this->id(),
|
||||||
'name' => $this->attrName(),
|
'name' => $this->Name(),
|
||||||
'value' => $this->attrTitle(),
|
'value' => $this->attrTitle(),
|
||||||
'tabindex' => $this->getTabIndexHTML(),
|
'tabindex' => $this->getTabIndexHTML(),
|
||||||
'onclick' => "return confirm('$this->confirmation');"
|
'onclick' => "return confirm('$this->confirmation');"
|
||||||
|
|
|
@ -26,8 +26,8 @@ class TextField extends FormField {
|
||||||
'type' => 'text',
|
'type' => 'text',
|
||||||
'class' => $this->extraClass() . ' text',
|
'class' => $this->extraClass() . ' text',
|
||||||
'id' => $this->id(),
|
'id' => $this->id(),
|
||||||
'name' => $this->attrName(),
|
'name' => $this->Name(),
|
||||||
'value' => $this->attrValue(),
|
'value' => $this->Value(),
|
||||||
'tabindex' => $this->getTabIndex(),
|
'tabindex' => $this->getTabIndex(),
|
||||||
'maxlength' => ($this->maxLength) ? $this->maxLength : null,
|
'maxlength' => ($this->maxLength) ? $this->maxLength : null,
|
||||||
'size' => ($this->maxLength) ? min( $this->maxLength, 30 ) : null
|
'size' => ($this->maxLength) ? min( $this->maxLength, 30 ) : null
|
||||||
|
|
Loading…
Reference in New Issue
Block a user