Changeset 5561

Timestamp:

05/12/08 11:04:58 (2 months ago)

Author:

joern.zaefferer

Message:

validation: Fixed #2215: Fixed message display to call unhighlight as part of showing and hiding messages, no more visual side-effects while checking an element and extracted validator.checkForm to validate a form without UI sideeffects

Location:

trunk/plugins/validate

Files:

• changelog.txt (modified) (1 diff)
• jquery.validate.js (modified) (4 diffs)
• test/test.js (modified) (2 diffs)

trunk/plugins/validate/changelog.txt

@@ -13 +13 @@
 * Fixed creditcard validation to accept only digits and dashes ("asdf" is not a valid creditcard number)
 * Allow both button and input elements for cancel buttons (via class="cancel")
+* Fixed #2215: Fixed message display to call unhighlight as part of showing and hiding messages, no more visual side-effects while checking an element and extracted validator.checkForm to validate a form without UI sideeffects
 
 1.2.1

trunk/plugins/validate/jquery.validate.js

@@ -297 +297 @@
         // http://docs.jquery.com/Plugins/Validation/Validator/form
         form: function() {
-            this.prepareForm();
-            var elements = this.elements();
-            for ( var i = 0; elements[i]; i++ ) {
-                this.check( elements[i] );
-            }
+            this.checkForm();
             jQuery.extend(this.submitted, this.errorMap);
             this.invalid = jQuery.extend({}, this.errorMap);
@@ -308 +304 @@
             this.showErrors();
             return this.valid();
+        },
+        
+        checkForm: function() {
+            this.prepareForm();
+            for ( var i = 0, elements = this.elements(); elements[i]; i++ ) {
+                this.check( elements[i] );
+            }
+            return this.valid(); 
         },
         
@@ -449 +453 @@
         check: function( element ) {
             element = this.clean( element );
-            this.settings.unhighlight && this.settings.unhighlight.call( this, element, this.settings.errorClass );
             
             // if radio/checkbox, validate first element in group instead
@@ -552 +555 @@
                 }
             }
+            if (this.settings.unhighlight) {
+                for ( var i = 0, elements = this.validElements(); elements[i]; i++ ) {
+                    this.settings.unhighlight.call( this, elements[i], this.settings.errorClass );
+                }
+            }
             this.toHide = this.toHide.not( this.toShow );
             this.hideErrors();
             this.addWrapper( this.toShow ).show();
+        },
+        
+        validElements: function() {
+            return this.elements().not(this.invalidElements());
+        },
+        
+        invalidElements: function() {
+            return jQuery(this.errorList).map(function() {
+                return this.element;
+            });
         },
         

trunk/plugins/validate/test/test.js

@@ -298 +298 @@
 
 test("option: (un)highlight, custom", function() {
-    expect(6);
-    $("#testForm1").validate({
+    expect(5);
+    $("#testForm1clean").validate({
         highlight: function(element, errorClass) {
             equals( "invalid", errorClass );
@@ -308 +308 @@
             $(element).show();
         },
-        errorClass: "invalid"
-    });
-    var e = $("#firstname")
+        errorClass: "invalid",
+        rules: {
+            firstname: "required"
+        }
+    });
+    var e = $("#firstnamec")
     ok( e.is(":visible") );
     e.valid()