php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-01 03:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.yiisoft.com:yii2

Browse Source
This commit is contained in:
Qiang Xue
2013-05-02 16:11:05 -04:00
parent e6af955bdc 66b123bce7
commit f6e3475653
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@
// the container CSS class representing the corresponding attribute has validation error // the container CSS class representing the corresponding attribute has validation error
errorCssClass: 'error', errorCssClass: 'error',
// the container CSS class representing the corresponding attribute passes validation // the container CSS class representing the corresponding attribute passes validation
successCssClass: 'success', successCssClass: 'success',
// the container CSS class representing the corresponding attribute is being validated // the container CSS class representing the corresponding attribute is being validated
validatingCssClass: 'validating', validatingCssClass: 'validating',
// a callback that is called before validating any attribute // a callback that is called before validating any attribute
@ -126,7 +126,7 @@
return this.each(function () { return this.each(function () {
$(window).unbind('.yiiActiveForm'); $(window).unbind('.yiiActiveForm');
$(this).removeData('yiiActiveForm'); $(this).removeData('yiiActiveForm');
}) });
} }
}; };
@ -220,7 +220,7 @@
/** /**
* Performs the ajax validation request. * Performs the ajax validation request.
* This method is invoked internally to trigger the ajax validation. * This method is invoked internally to trigger the ajax validation.
* @param form jquery the jquery representation of the form * @param $form jquery the jquery representation of the form
* @param successCallback function the function to be invoked if the ajax request succeeds * @param successCallback function the function to be invoked if the ajax request succeeds
* @param errorCallback function the function to be invoked if the ajax request fails * @param errorCallback function the function to be invoked if the ajax request fails
*/ */
@ -352,7 +352,7 @@
* updates the error message and the input container for a particular attribute. * updates the error message and the input container for a particular attribute.
* @param attribute object the configuration for a particular attribute. * @param attribute object the configuration for a particular attribute.
* @param messages array the json data obtained from the ajax validation request * @param messages array the json data obtained from the ajax validation request
* @param form the form jQuery object * @param $form the form jQuery object
* @return boolean whether there is a validation error for the specified attribute * @return boolean whether there is a validation error for the specified attribute
*/ */
var updateInput = function ($form, attribute, messages) { var updateInput = function ($form, attribute, messages) {

20
framework/assets/yii.validation.js
View File

@ -27,7 +27,9 @@ yii.validation = (function ($) {
valid = true; valid = true;
} }
valid || messages.push(options.message); if(!valid) {
messages.push(options.message);
}
}, },
boolean: function (value, messages, options) { boolean: function (value, messages, options) {
@ -37,7 +39,9 @@ yii.validation = (function ($) {
var valid = !options.strict && (value == options.trueValue || value == options.falseValue) var valid = !options.strict && (value == options.trueValue || value == options.falseValue)
|| options.strict && (value === options.trueValue || value === options.falseValue); || options.strict && (value === options.trueValue || value === options.falseValue);
valid || messages.push(options.message); if(!valid) {
messages.push(options.message);
}
}, },
string: function (value, messages, options) { string: function (value, messages, options) {
@ -86,7 +90,9 @@ yii.validation = (function ($) {
var valid = !options.not && $.inArray(value, options.range) var valid = !options.not && $.inArray(value, options.range)
|| options.not && !$.inArray(value, options.range); || options.not && !$.inArray(value, options.range);
valid || messages.push(options.message); if(!valid) {
messages.push(options.message);
}
}, },
regularExpression: function (value, messages, options) { regularExpression: function (value, messages, options) {
@ -106,7 +112,9 @@ yii.validation = (function ($) {
var valid = value.match(options.pattern) && (!options.allowName || value.match(options.fullPattern)); var valid = value.match(options.pattern) && (!options.allowName || value.match(options.fullPattern));
valid || messages.push(options.message); if(!valid) {
messages.push(options.message);
}
}, },
url: function (value, messages, options) { url: function (value, messages, options) {
@ -182,7 +190,9 @@ yii.validation = (function ($) {
break; break;
} }
valid || messages.push(options.message); if(!valid) {
messages.push(options.message);
}
} }
}; };
})(jQuery); })(jQuery);