浏览代码

Use typeof to check if validate result is deferred or boolean

nghuuphuoc 11 年之前
父节点
当前提交
40995b0468
共有 3 个文件被更改,包括 9 次插入19 次删除
  1. 4 9
      dist/js/bootstrapValidator.js
  2. 1 1
      dist/js/bootstrapValidator.min.js
  3. 4 9
      src/js/bootstrapValidator.js

+ 4 - 9
dist/js/bootstrapValidator.js

@@ -316,19 +316,14 @@
                     validateResult.done(function(isValid, v) {
                         // v is validator name
                         delete that.dfds[field][v];
+                        isValid ? that.removeError($field, v) : that.showError($field, v);
                         if (isValid && that.formSubmitted) {
                             that._submit();
                         }
                     });
+                } else if ('boolean' == typeof validateResult) {
+                    validateResult ? this.removeError($field, validatorName) : this.showError($field, validatorName);
                 }
-
-                $.when(validateResult).then(function(isValid) {
-                    if (isValid) {
-                        that.removeError($field, validatorName);
-                    } else {
-                        that.showError($field, validatorName);
-                    }
-                });
             }
         },
 
@@ -341,7 +336,7 @@
             var field, validatorName;
             for (field in this.results) {
                 for (validatorName in this.results[field]) {
-                    if (this.results[field][validatorName] == this.STATUS_VALIDATING) {
+                    if (this.results[field][validatorName] == this.STATUS_NOT_VALIDATED || this.results[field][validatorName] == this.STATUS_VALIDATING) {
                         return false;
                     }
 

文件差异内容过多而无法显示
+ 1 - 1
dist/js/bootstrapValidator.min.js


+ 4 - 9
src/js/bootstrapValidator.js

@@ -315,19 +315,14 @@
                     validateResult.done(function(isValid, v) {
                         // v is validator name
                         delete that.dfds[field][v];
+                        isValid ? that.removeError($field, v) : that.showError($field, v);
                         if (isValid && that.formSubmitted) {
                             that._submit();
                         }
                     });
+                } else if ('boolean' == typeof validateResult) {
+                    validateResult ? this.removeError($field, validatorName) : this.showError($field, validatorName);
                 }
-
-                $.when(validateResult).then(function(isValid) {
-                    if (isValid) {
-                        that.removeError($field, validatorName);
-                    } else {
-                        that.showError($field, validatorName);
-                    }
-                });
             }
         },
 
@@ -340,7 +335,7 @@
             var field, validatorName;
             for (field in this.results) {
                 for (validatorName in this.results[field]) {
-                    if (this.results[field][validatorName] == this.STATUS_VALIDATING) {
+                    if (this.results[field][validatorName] == this.STATUS_NOT_VALIDATED || this.results[field][validatorName] == this.STATUS_VALIDATING) {
                         return false;
                     }