Ticket #6005: FormValidation.2.3.patch

dijit/tests/form/Form.html

@@ -130 +130 @@
         http://www.tipjar.com/cgi-bin/test -->
 <form dojoType="dijit.form.Form" id="myForm" encType="multipart/form-data" action="" method="" 
         onreset="return confirm('Press OK to reset widget values')"
-        onsubmit="alert('Attempting to submit form w/values:\n'+dojo.toJson(this.getValues(),true));if(this.isValid()){return confirm('Form is valid, press OK to submit');}else{alert('Form contains invalid data.  Please correct first');return false;}"
+        onsubmit="alert('Attempting to submit form w/values:\n'+dojo.toJson(this.getValues(),true));if(this.validate()){return confirm('Form is valid, press OK to submit');}else{alert('Form contains invalid data.  Please correct first');return false;}"
 >
 <p>Just HTML text</p>
 <table border=2>

dijit/form/ValidationTextBox.js

@@ -105 +105 @@
                                 }
                         }
                         this.displayMessage(message);
+                        return isValid;
                 },
 
                 // currently displayed message
@@ -169 +170 @@
 
                 validate: function(){
                         this.valueNode.value = this.toString();
-                        this.inherited(arguments);
+                        return this.inherited(arguments);
                 },
 
                 setAttribute: function(/*String*/ attr, /*anything*/ value){

dijit/form/Form.js

@@ -33 +33 @@
                         });
                 },
 
+                validate: function(){
+                        // summary: returns if the form is valid - same as isValid - but
+                        //                      provides a few additional (ui-specific) features.
+                        //                      1 - it will highlight any sub-widgets that are not
+                        //                              valid
+                        //                      2 - it will call focus() on the first invalid 
+                        //                              sub-widget
+                        var didFocus = false;
+                        return dojo.every(dojo.map(this.getDescendants(), function(widget){
+                                // Need to set this so that "required" widgets get their 
+                                // state set.
+                                widget._hasBeenBlurred = true;
+                                var valid = !widget.validate || widget.validate();
+                                if (!valid && !didFocus) {
+                                        // Set focus of the first non-valid widget
+                                        dijit.scrollIntoView(widget.containerNode||widget.domNode);
+                                        widget.focus();
+                                        didFocus = true;
+                                }
+                                return valid;
+                        }), "return item;");
+                },
+                
                 setValues: function(/*object*/obj){
                         // summary: fill in form values from a JSON structure