Ticket #4740: 4740.patch

Users/bgibson/Documents/workspace/trunk/dijit/_Widget.js

@@ -387 +387 @@
                 //      summary:
                 //              Connects specified obj/event to specified method of this object
                 //              and registers for disconnect() on widget destroy.
-                //              Special event: "ondijitclick" triggers on a click or enter-down or space-up
+                //              Special event: "ondijitclick" triggers on a click or space-up, enter-down in IE
+                //              or enter press in FF (since often can't cancel enter onkeydown in FF)
                 //              Similar to dojo.connect() but takes three arguments rather than four.
                 var handles =[];
                 if(event == "ondijitclick"){
@@ -395 +396 @@
                         if(!this.nodesWithKeyClick[obj.nodeName]){
                                 handles.push(dojo.connect(obj, "onkeydown", this,
                                         function(e){
-                                                if(e.keyCode == dojo.keys.ENTER){
+                                                if(!dojo.isFF && e.keyCode == dojo.keys.ENTER){
                                                         return (dojo.isString(method))?
                                                                 this[method](e) : method.call(this, e);
                                                 }else if(e.keyCode == dojo.keys.SPACE){
@@ -411 +412 @@
                                                                 this[method](e) : method.call(this, e);
                                                 }
                                         }));
+                                if (dojo.isFF){
+                                handles.push(dojo.connect(obj, "onkeypress", this,
+                                        function(e){
+                                                if(e.keyCode == dojo.keys.ENTER){
+                                                        return (dojo.isString(method))?
+                                                                this[method](e) : method.call(this, e);
+                                                }
+                                        }));
+                                }
                         }
                         event = "onclick";
                 }

Users/bgibson/Documents/workspace/trunk/dijit/tests/ondijitclick.html

@@ -44 +44 @@
                                                                 w.clickCount = 0;
                                                                 w.domNode.dispatchEvent(e);
                                                                 t.is(1, w.clickCount);
-                                                        }
+                                                        }       
                                                 }
                                         },
                                         {
-                                                name: "ondijitclick fires once on an enter-key-down",
+                                                name: "ondijitclick fires once on an enter-key-down except in FF",
                                                 runTest: function(t){
                                                         var w = dijit.byId("widget1");
                                                         if (dojo.isSafari){ // safari has error
@@ -63 +63 @@
                                                                 w.domNode.focus();
                                                                 w.clickCount = 0;
                                                                 w.domNode.dispatchEvent(e);
-                                                                t.is(1, w.clickCount);
+                                                                if (!dojo.isFF){
+                                                                        t.is(1,w.clickCount);
+                                                                }else{
+                                                                        t.is(0, w.clickCount);
+                                                                }
+                                                        }
+                                                }
+                                        },
+                                        {
+                                                name: "ondijitclick fires once on an enter-key-press in FF",
+                                                runTest: function(t){
+                                                        var w = dijit.byId("widget1");
+                                                        if (dojo.isSafari){ // safari has error
+                                                                this.name += " * SKIPPED *";
+                                                                return;
+                                                        }
+
+                                                        // simulate enter down
+                                                        if (document.createEvent && !dojo.isSafari){
+                                                                var e = document.createEvent("KeyboardEvent");
+                                                                e.initKeyEvent("keypress",true,true,null,false,false,false,false,13,0);
+                                                                w.domNode.focus();
+                                                                w.clickCount = 0;
+                                                                w.domNode.dispatchEvent(e);
+                                                                if (dojo.isFF){
+                                                                        t.is(1, w.clickCount);
+                                                                }else{
+                                                                        t.is(0, w.clickCount);
+                                                                }
+                                                        }
+                                                }
+                                        },
+                                        {
+                                                name: "ondijitclick does not fire on a space-key-down",
+                                                runTest: function(t){
+                                                        var w = dijit.byId("widget1");
+                                                        if (dojo.isSafari){ // safari has error
+                                                                this.name += " * SKIPPED *";
+                                                                return;
+                                                        }
+
+                                                        // simulate space up
+                                                        if (document.createEvent){
+                                                                var e = document.createEvent("KeyboardEvent");
+                                                                e.initKeyEvent("keydown",true,true,null,false,false,false,false,32,0);
+                                                                w.domNode.focus();
+                                                                w.clickCount = 0;
+                                                                w.domNode.dispatchEvent(e);
+                                                                t.is(0, w.clickCount);
                                                         }
                                                 }
                                         },