Changeset 4889

Timestamp:

03/12/08 02:37:41 (9 months ago)

Author:

scott.gonzalez

Message:

validation: improved dependency checks

Location:

trunk/plugins/validate

Files:

• jquery.validate.js (modified) (2 diffs)
• test/test.js (modified) (3 diffs)

trunk/plugins/validate/jquery.validate.js

@@ -704 +704 @@
         // handle dependency check
         $.each(rules, function(prop, val) {
-            if (val.param) {
+            if (val.param || val.depends) {
                 var keepRule = true;
                 switch (typeof val.depends) {
@@ -714 +714 @@
                         break;
                 }
+                
                 if (keepRule) {
-                    rules[prop] = val.param;
+                    rules[prop] = val.param !== undefined ? val.param : true;
                 } else {
                     delete rules[prop];

trunk/plugins/validate/test/test.js

@@ -523 +523 @@
 
 test("rules(), dependency checks", function() {
-    expect(5);
+    expect(7);
     var v = $("#testForm1clean").validate({
         rules: {
@@ -538 +538 @@
                 max: {
                     param: 12
+                },
+                email: {
+                    depends: function() { return true; }
                 }
             }
@@ -554 +557 @@
     equals( "max", rules[0].method );
     equals( 12, rules[0].parameters );
+    equals( "email", rules[1].method );
+    equals( true, rules[1].parameters );
 });