Changeset 5695

Timestamp:

05/25/08 22:09:25 (8 months ago)

Author:

joern.zaefferer

Message:

validate: * Implemented #2908, enabling custom messages via metadata ala class="{required:true,messages:{required:'required field'}}"

Location:

trunk/plugins/validate

Files:

• changelog.txt (modified) (1 diff)
• jquery.validate.js (modified) (3 diffs)

trunk/plugins/validate/changelog.txt

@@ -2 +2 @@
 ---
 * Fixed #2931, validate elements in document order and ignore type=image inputs
+* Implemented #2908, enabling custom messages via metadata ala class="{required:true,messages:{required:'required field'}}"
 
 1.3

trunk/plugins/validate/jquery.validate.js

@@ -499 +499 @@
         },
         
+        // return the custom message for the given element and validation method
+        // specified in the element's "messages" metadata
+        customMetaMessage: function(element, method) {
+            if (!jQuery.metadata)
+                return;
+            
+            var meta = this.settings.meta
+                ? jQuery(element).metadata()[this.settings.meta]
+                : jQuery(element).metadata();
+            
+            return meta.messages && meta.messages[method];
+        },
+        
         // return the custom message for the given element name and validation method
         customMessage: function( name, method ) {
@@ -519 +532 @@
             return this.findDefined(
                 this.customMessage( element.name, method ),
+                this.customMetaMessage( element, method ),
                 // title is never undefined, so handle empty string as undefined
                 element.title || undefined,
@@ -832 +846 @@
                 delete rules.maxlength;
             }
+        }
+        
+        // To support custom messages in metadata ignore rule methods titled "messages"
+        if (rules.messages) {
+            delete rules.messages
         }