tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX createTag() on FormField subclasses should use getTabIndex() instead of getTabIndexHTML() as createTag() is responsible for generating the HTML, and all we need is the tabindex value

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62490 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-09-16 23:14:31 +00:00
parent 5524225ead
commit 955d500a95
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
forms/AjaxFormAction.php
View File

@ -18,13 +18,14 @@ class AjaxFormAction extends FormAction {
$this->ajaxAction = $ajaxAction ? $ajaxAction : $action; $this->ajaxAction = $ajaxAction ? $ajaxAction : $action;
parent::__construct($action, $title, $form); parent::__construct($action, $title, $form);
} }
function Field() { function Field() {
return $this->createTag('input', array( return $this->createTag('input', array(
'class' => "ajaxAction-$this->ajaxAction action", 'class' => "ajaxAction-$this->ajaxAction action",
'id' => $this->id(), 'id' => $this->id(),
'type' => 'submit', 'type' => 'submit',
'value' => $this->title, 'value' => $this->title,
'tabindex' => $this->getTabIndexHTML() 'tabindex' => $this->getTabIndex()
)); ));
} }

2
forms/AjaxUniqueTextField.php
View File

@ -44,7 +44,7 @@ class AjaxUniqueTextField extends TextField {
'id' => $this->id(), 'id' => $this->id(),
'name' => $this->Name(), 'name' => $this->Name(),
'value' => $this->Value(), 'value' => $this->Value(),
'tabindex' => $this->getTabIndexHTML(), 'tabindex' => $this->getTabIndex(),
'maxlength' => ($this->maxLength) ? $this->maxLength : null 'maxlength' => ($this->maxLength) ? $this->maxLength : null
); );

2
forms/AutocompleteTextField.php
View File

@ -26,7 +26,7 @@ class AutocompleteTextField extends TextField {
'id' => $this->id(), 'id' => $this->id(),
'name' => $this->name, 'name' => $this->name,
'value' => $this->Value(), 'value' => $this->Value(),
'tabindex' => $this->getTabIndexHTML(), 'tabindex' => $this->getTabIndex(),
'size' => $this->maxLength ? min( $this->maxLength, 30 ) : 30 'size' => $this->maxLength ? min( $this->maxLength, 30 ) : 30
); );
if($this->maxLength) $attributes['maxlength'] = $this->maxLength; if($this->maxLength) $attributes['maxlength'] = $this->maxLength;

2
forms/CheckboxFieldDisabled.php
View File

@ -17,7 +17,7 @@ class CheckboxFieldDisabled extends CheckboxField {
'class' => $this->extraClass() . " text", 'class' => $this->extraClass() . " text",
'id' => $this->id(), 'id' => $this->id(),
'name' => $this->Name(), 'name' => $this->Name(),
'tabindex' => $this->getTabIndexHTML(), 'tabindex' => $this->getTabIndex(),
'checked' => ($this->value) ? 'checked' : false, 'checked' => ($this->value) ? 'checked' : false,
'disabled' => 'disabled' 'disabled' => 'disabled'
); );

3
forms/ConfirmedFormAction.php
View File

@ -19,6 +19,7 @@ class ConfirmedFormAction extends FormAction {
$this->confirmation = $confirmation; $this->confirmation = $confirmation;
parent::__construct($action, $title, $form); parent::__construct($action, $title, $form);
} }
function Field() { function Field() {
$attributes = array( $attributes = array(
'type' => 'submit', 'type' => 'submit',
@ -26,7 +27,7 @@ class ConfirmedFormAction extends FormAction {
'id' => $this->id(), 'id' => $this->id(),
'name' => $this->Name(), 'name' => $this->Name(),
'value' => $this->attrTitle(), 'value' => $this->attrTitle(),
'tabindex' => $this->getTabIndexHTML(), 'tabindex' => $this->getTabIndex(),
'onclick' => "return confirm('$this->confirmation');" 'onclick' => "return confirm('$this->confirmation');"
); );