Ticket #6299: 6299.patch

form/Button.js

@@ -49 +49 @@
                 // summary: callback when the user mouse clicks the button portion
                 if(this._onClick(e) === false){ // returning nothing is same as true
                         dojo.stopEvent(e);
-                }else if(this.type=="submit"){ // see if a nonform widget needs to be signalled
+                }else if(this.type=="submit" && !this.focusNode.form){ // see if a nonform widget needs to be signalled
                         for(var node=this.domNode; node.parentNode/*#5935*/; node=node.parentNode){
                                 var widget=dijit.byNode(node);
                                 if(widget && typeof widget._onSubmit == "function"){

form/Form.js

@@ -284 +284 @@
                 accept: "",
                 target: "",
 
-                templateString: "<form dojoAttachPoint='containerNode' name='${name}'></form>",
+                templateString: "<form dojoAttachPoint='containerNode' dojoAttachEvent='onreset:_onReset,onsubmit:_onSubmit' name='${name}'></form>",
 
                 attributeMap: dojo.mixin(dojo.clone(dijit._Widget.prototype.attributeMap),
-                        {onSubmit: "", action: "", method: "", encType: "", "accept-charset": "", accept: "", target: ""}),
+                        {action: "", method: "", encType: "", "accept-charset": "", accept: "", target: ""}),
 
                 execute: function(/*Object*/ formContents){
                         //      summary:
@@ -316 +316 @@
                                 }
                         }
                         this.inherited(arguments);
-                        dojo.attr(this.domNode, 'onreset', dojo.hitch(this, this._onReset));
                 },
 
-                onReset: function(){ 
+                onReset: function(/*Event?*/e){ 
                         //      summary:
                         //              Callback when user resets the form. This method is intended
                         //              to be over-ridden. When the `reset` method is called
@@ -328 +327 @@
                         return true; // Boolean
                 },
 
-                _onReset: function(){
-                        if(this.onReset()){
+                _onReset: function(e){
+                        // create fake event so we can know if preventDefault() is called
+                        var faux = {
+                                returnValue: true, // the IE way
+                                preventDefault: function(){  // not IE
+                                                        this.returnValue = false;
+                                                },
+                                stopPropagation: function(){}, currentTarget: e.currentTarget, target: e.target
+                        };
+                        // if return value is not exactly false, and haven't called preventDefault(), then reset
+                        if(!(this.onReset(faux) === false) && faux.returnValue){
                                 this.reset();
                         }
-                        return false; // Boolean
+                        dojo.stopEvent(e);
+                        return false;
                 },
 
-                // TODO: remove ths function beginning with 2.0
-                _onSubmit: function(){
+                _onSubmit: function(e){
                         var fp = dijit.form.Form.prototype;
+                        // TODO: remove ths if statement beginning with 2.0
                         if(this.execute != fp.execute || this.onExecute != fp.onExecute){
                                 dojo.deprecated("dijit.form.Form:execute()/onExecute() are deprecated. Use onSubmit() instead.", "", "2.0");
                                 this.onExecute();
                                 this.execute(this.getValues());
                         }
+                        if(this.onSubmit(e) === false){ // only exactly false stops submit
+                                dojo.stopEvent(e);
+                        }
                 },
                 
                 onSubmit: function(/*Event?*/e){ 
@@ -354 +366 @@
                         //              `onSubmit` is used to compute whether or not submission
                         //              should proceed
 
-                        if(!this.isValid()){
-                                if(e){ dojo.stopEvent(e); }
-                                return false; // Boolean
-                        }
-                        return true; // Boolean
+                        return this.isValid(); // Boolean
                 },
 
                 submit: function(){
                         // summary:
                         //              programmatically submit form if and only if the `onSubmit` returns true
-                        if(!!this.onSubmit()){
+                        if(!(this.onSubmit() === false)){
                                 this.containerNode.submit();
                         }
                 }

tests/form/Form.html

@@ -145 +145 @@
                         }
                         return true;
                 </script>
+                <script type="dojo/method" event="onReset">
+                        return confirm('reset Form?');
+                </script>
                 <p>Just HTML text</p>
                 <table style="border: 1px solid #9f9f9f;" cellspacing="10">
                         <thead>

tests/form/test_Form_onsubmit.html

@@ -28 +28 @@
 </head>
 <body>
         <h1>Form Widget Unit Test</h1>
-        <form dojoType="dijit.form.Form" id="myForm" 
+        <form dojoType="dijit.form.Form" id="myForm1" 
                 encType="multipart/form-data" action="" method="GET"
-                onSubmit="dojo.stopEvent(arguments[0]);">
-                <h3>This form shouldn't submit</h3>
+                onSubmit="dojo.stopEvent(arguments[0]);"
+                onReset="dojo.stopEvent(arguments[0]);">
+                <h3>This form shouldn't submit, nor reset</h3>
                 <select name="plop.combo" dojoType="dijit.form.ComboBox">
                         <option value="one">one</option>
                         <option value="two">two</option>
@@ -43 +44 @@
 
         <form dojoType="dijit.form.Form" id="myForm2" 
                 encType="multipart/form-data" action="" method="GET"
-                onSubmit="return false;">
-                <h3>This form <em>should</em> submit</h3>
+                onSubmit="return false;"
+                onReset="return false;">
+                <h3>This form shouldn't submit, nor reset</h3>
                 <select name="plop.combo" dojoType="dijit.form.ComboBox">
                         <option value="one">one</option>
                         <option value="two">two</option>
@@ -53 +55 @@
                 <button dojoType=dijit.form.Button type="submit">Submit</button>
                 <button dojoType=dijit.form.Button type="reset">Reset</button>
         </form>
+
+        <form dojoType="dijit.form.Form" id="myForm3" 
+                encType="multipart/form-data" action="" method="GET"
+                onSubmit="return true;"
+                onReset="return true;">
+                <h3>This form <em>should</em> submit and reset</h3>
+                <select name="plop.combo" dojoType="dijit.form.ComboBox">
+                        <option value="one">one</option>
+                        <option value="two">two</option>
+                        <option value="three">three</option>
+                </select>
+                <button dojoType=dijit.form.Button type="submit">Submit</button>
+                <button dojoType=dijit.form.Button type="reset">Reset</button>
+        </form>
+
+        <form dojoType="dijit.form.Form" id="myForm4" 
+                encType="multipart/form-data" action="" method="GET"
+                onSubmit="void(0)"
+                onReset="void(0)">
+                <h3>This form <em>should</em> submit and reset</h3>
+                <select name="plop.combo" dojoType="dijit.form.ComboBox">
+                        <option value="one">one</option>
+                        <option value="two">two</option>
+                        <option value="three">three</option>
+                </select>
+                <button dojoType=dijit.form.Button type="submit">Submit</button>
+                <button dojoType=dijit.form.Button type="reset">Reset</button>
+        </form>
 </body>
 </html>