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

Form asset bundle registering code moved from ActiveForm::run() to the *Validator::clientValidateAttribute().

Browse Source
This commit is contained in:
resurtm
2013-05-15 23:33:55 +06:00
parent f7b8595f76
commit bf1b2d9956
11 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yii/validators/EmailValidator.php
View File

@@ -119,10 +119,6 @@ class EmailValidator extends Validator
*/
public function clientValidateAttribute($object, $attribute, $view)
{
if ($this->enableIDN) {
$view->registerAssetBundle('punycode');
}
$options = array(
'pattern' => new JsExpression($this->pattern),
'fullPattern' => new JsExpression($this->fullPattern),
@@ -137,6 +133,10 @@ class EmailValidator extends Validator
$options['skipOnEmpty'] = 1;
}
$view->registerAssetBundle('yii/form');
if ($this->enableIDN) {
$view->registerAssetBundle('punycode');
}
return 'yii.validation.email(value, messages, ' . Json::encode($options) . ');';
}
}