浏览代码

Merge from v0.4.0 branch

phuoc 11 年之前
父节点
当前提交
33cb378f79
共有 3 个文件被更改,包括 3 次插入17 次删除
  1. 1 1
      dist/js/bootstrapValidator.js
  2. 1 1
      dist/js/bootstrapValidator.min.js
  3. 1 15
      src/js/bootstrapValidator.js

+ 1 - 1
dist/js/bootstrapValidator.js

@@ -434,7 +434,7 @@
                 validateResult;
 
             // We don't need to validate disabled field
-            if ($field.is(':disabled')) {
+            if ($field.is(':disabled') || $field.is(':hidden') || !$field.is(':visible')) {
                 return this;
             }
 

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


+ 1 - 15
src/js/bootstrapValidator.js

@@ -184,13 +184,6 @@
 
             var fields = this.getFieldElements(field);
 
-            // We don't need to validate invisible or hidden fields
-            if(!fields.parent('.form-group').is(":visible") || fields.parent('.form-group').is(":hidden")) {
-                delete this.options.fields[field];
-                delete this.dfds[field];
-                return;
-            }
-            
             // We don't need to validate non-existing fields
             if (fields == null) {
                 delete this.options.fields[field];
@@ -440,17 +433,10 @@
                 validateResult;
 
             // We don't need to validate disabled field
-            if ($field.is(':disabled')) {
+            if ($field.is(':disabled') || $field.is(':hidden') || !$field.is(':visible')) {
                 return this;
             }
 
-            // We don't need to validate hide field
-            if (fields.length == 1 && (fields.parent('.form-group').is(':hidden') || !fields.parent('.form-group').is(':visible'))) {
-                delete this.options.fields[field];
-                delete this.dfds[field];
-                return;
-            }
-
             for (validatorName in validators) {
                 if ($field.data('bv.dfs.' + validatorName)) {
                     $field.data('bv.dfs.' + validatorName).reject();