Merge pull request victorjonsson#48 from seryl/support_null_validation

Support null validation (Remove validation)
ivcreative · Sep 1, 2013 · ab82b49 · ab82b49
2 parents 3597fce + 69b2ef1
commit ab82b49
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/form-validator/jquery.form-validator.js b/form-validator/jquery.form-validator.js
@@ -126,6 +126,12 @@
                 .addClass('valid')
                 .parent()
                     .addClass('has-success'); // twitter bs
+        } else if(validation === null) {
+            $element
+                .removeClass('valid')
+                .parent()
+                    .removeClass('has-error')
+                    .removeClass('has-success');
         } else {
             $element
                 .addClass(config.errorElementClass)
@@ -698,7 +704,7 @@
             // if empty AND optional attribute is present
             // OR depending on a checkbox being checked AND checkbox is checked, return true
             if ((!value && optional === 'true') || (validationDependsOnCheckedInput && !validationDependentInputIsChecked)) {
-                return true;
+                return null;
             }
 
             var validationRules = $element.attr(config.validationRuleAttribute),