php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-15 23:04:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed variables, changed logic of turning client updates on

Browse Source
This commit is contained in:
Alexander Makarov
2016-12-02 14:30:13 +03:00
parent b25ebaa782
commit dc294ba56f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/assets/yii.activeForm.js
View File

@ -170,7 +170,7 @@
// the value of the input // the value of the input
value: undefined, value: undefined,
// whether to toggle aria-invalid attribute after validation // whether to toggle aria-invalid attribute after validation
ariaInvalidToggle: true updateAriaInvalid: true
}; };
@ -779,7 +779,7 @@
}; };
var toggleAriaInvalid = function ($form, attribute, hasError) { var toggleAriaInvalid = function ($form, attribute, hasError) {
if (attribute.ariaInvalidToggle) { if (attribute.updateAriaInvalid) {
$form.find(attribute.input).attr('aria-invalid', hasError ? 'true' : 'false'); $form.find(attribute.input).attr('aria-invalid', hasError ? 'true' : 'false');
} }
} }

12
framework/widgets/ActiveField.php
View File

@ -164,9 +164,9 @@ class ActiveField extends Component
private $_skipLabelFor = false; private $_skipLabelFor = false;
/** /**
* @var bool whether `aria-invalid` HTML attribute should be toggled by validation on client * @var bool whether `aria-invalid` HTML attribute should be updated by client validation
*/ */
private $_skipClientAriaInvalid = true; private $_updateAriaInvalidOnClient = true;
/** /**
@ -803,8 +803,8 @@ class ActiveField extends Component
$options['validate'] = new JsExpression("function (attribute, value, messages, deferred, \$form) {" . implode('', $validators) . '}'); $options['validate'] = new JsExpression("function (attribute, value, messages, deferred, \$form) {" . implode('', $validators) . '}');
} }
if ($this->addAriaAttributes === false && !$this->_skipClientAriaInvalid) { if ($this->addAriaAttributes === false || !$this->_updateAriaInvalidOnClient) {
$options['ariaInvalidToggle'] = false; $options['updateAriaInvalid'] = false;
} }
// only get the options that are different from the default ones (set in yii.activeForm.js) // only get the options that are different from the default ones (set in yii.activeForm.js)
@ -815,7 +815,7 @@ class ActiveField extends Component
'validationDelay' => 500, 'validationDelay' => 500,
'encodeError' => true, 'encodeError' => true,
'error' => '.help-block', 'error' => '.help-block',
'ariaInvalidToggle' => true, 'updateAriaInvalid' => true,
]); ]);
} }
@ -865,7 +865,7 @@ class ActiveField extends Component
if ($this->model->hasErrors($this->attribute)) { if ($this->model->hasErrors($this->attribute)) {
$options['aria-invalid'] = 'true'; $options['aria-invalid'] = 'true';
} }
$this->_skipClientAriaInvalid = false; $this->_updateAriaInvalidOnClient = false;
} }
} }
} }