Changeset 13759

Timestamp:

05/17/08 08:59:40 (2 months ago)

Author:

doughays

Message:

Fixes #6186. Added keydown handler for IE and safari to make sure ESC key fires keypress and is stoppable.

Files:

• dijit/trunk/form/_FormWidget.js (modified) (2 diffs)

dijit/trunk/form/_FormWidget.js

@@ -300 +300 @@
 
         postCreate: function(){
+                if(dojo.isIE || dojo.isSafari){ // IE won't stop the event with keypress and Safari won't send an ESCAPE to keypress at all
+                        this.connect(this.focusNode || this.domNode, "onkeydown", this._onKeyDown);
+                }
                 this.setValue(this.value, null);
         },
@@ -329 +332 @@
         },
 
+        _onKeyDown: function(e){
+                if(e.keyCode == dojo.keys.ESCAPE && !e.ctrlKey && !e.altKey){
+                        var te;
+                        if(dojo.isIE){ 
+                                e.preventDefault(); // default behavior needs to be stopped here since keypress is too late
+                                te = document.createEventObject();
+                                te.keyCode = dojo.keys.ESCAPE;
+                                te.shiftKey = e.shiftKey;
+                                e.srcElement.fireEvent('onkeypress', te);
+                        }else if(dojo.isSafari){ // ESCAPE needs help making it into keypress
+                                te = document.createEvent('Events');
+                                te.initEvent('keypress', true, true);
+                                te.keyCode = dojo.keys.ESCAPE;
+                                te.shiftKey = e.shiftKey;
+                                e.target.dispatchEvent(te);
+                        }
+                }
+        },
+
         _onKeyPress: function(e){
-                if(e.charOrCode == dojo.keys.ESCAPE && !e.shiftKey && !e.ctrlKey && !e.altKey){
-                        if(this._valueChanged()){
-                                this.undo();
-                                dojo.stopEvent(e);
-                                return false;
-                        }
-                }
-                else if(this.intermediateChanges){
+                if(e.charOrCode == dojo.keys.ESCAPE && !e.ctrlKey && !e.altKey && this._valueChanged()){
+                        this.undo();
+                        dojo.stopEvent(e);
+                        return false;
+                }else if(this.intermediateChanges){
                         var _this = this;
                         // the setTimeout allows the key to post to the widget input box