refactor into separate events

Author: redmunds

src/editor/CodeHintManager.js

@@ -517,7 +517,7 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Handles keys related to displaying, searching, and navigating the hint list.
+     * Handle keys related to displaying, searching, and navigating the hint list.
      * This gets called before handleChange.
      *
      * TODO: Ideally, we'd get a more semantic event from the editor that told us
@@ -529,24 +529,29 @@ define(function (require, exports, module) {
      * @param {Editor} editor
      * @param {KeyboardEvent} event
      */
-    function _handleKeyEvent(jqEvent, editor, event) {
+    function _handleKeydownEvent(jqEvent, editor, event) {
         keyDownEditor = editor;
-        if (event.type === "keydown") {
-            if (!(event.ctrlKey || event.altKey || event.metaKey) &&
-                    (event.keyCode === KeyEvent.DOM_VK_ENTER ||
-                     event.keyCode === KeyEvent.DOM_VK_RETURN ||
-                     event.keyCode === KeyEvent.DOM_VK_TAB)) {
-                lastChar = String.fromCharCode(event.keyCode);
-            }
-        } else if (event.type === "keypress") {
-            // Last inserted character, used later by handleChange
-            lastChar = String.fromCharCode(event.charCode);
-            
-            // Pending Text is used in hintList._keydownHook()
-            if (hintList) {
-                hintList.addPendingText(lastChar);
-            }
-        } else if (event.type === "keyup" && _inSession(editor)) {
+        if (!(event.ctrlKey || event.altKey || event.metaKey) &&
+                (event.keyCode === KeyEvent.DOM_VK_ENTER ||
+                 event.keyCode === KeyEvent.DOM_VK_RETURN ||
+                 event.keyCode === KeyEvent.DOM_VK_TAB)) {
+            lastChar = String.fromCharCode(event.keyCode);
+        }
+    }
+    function _handleKeypressEvent(jqEvent, editor, event) {
+        keyDownEditor = editor;
+
+        // Last inserted character, used later by handleChange
+        lastChar = String.fromCharCode(event.charCode);
+
+        // Pending Text is used in hintList._keydownHook()
+        if (hintList) {
+            hintList.addPendingText(lastChar);
+        }
+    }
+    function _handleKeyupEvent(jqEvent, editor, event) {
+        keyDownEditor = editor;
+        if (_inSession(editor)) {
             if (event.keyCode === KeyEvent.DOM_VK_HOME || event.keyCode === KeyEvent.DOM_VK_END) {
                 _endSession();
             } else if (event.keyCode === KeyEvent.DOM_VK_LEFT ||
@@ -626,13 +631,17 @@ define(function (require, exports, module) {
     function activeEditorChangeHandler(event, current, previous) {
         if (current) {
             $(current).on("editorChange", _handleChange);
-            $(current).on("keyEvent", _handleKeyEvent);
+            $(current).on("keydown",  _handleKeydownEvent);
+            $(current).on("keypress", _handleKeypressEvent);
+            $(current).on("keyup",    _handleKeyupEvent);
         }
 
         if (previous) {
             //Removing all old Handlers
             $(previous).off("editorChange", _handleChange);
-            $(previous).off("keyEvent", _handleKeyEvent);
+            $(previous).off("keydown",  _handleKeydownEvent);
+            $(previous).off("keypress", _handleKeypressEvent);
+            $(previous).off("keyup",    _handleKeyupEvent);
         }
     }
 

src/editor/Editor.js

@@ -257,8 +257,8 @@ define(function (require, exports, module) {
         $(this).on("cursorActivity", function (jqEvent, editor) {
             self._handleCursorActivity(jqEvent);
         });
-        $(this).on("keyEvent", function (jqEvent, editor, cmEvent) {
-            self._handleKeyEvents(cmEvent);
+        $(this).on("keypress", function (jqEvent, editor, cmEvent) {
+            self._handleKeypressEvents(cmEvent);
         });
         $(this).on("change", function (jqEvent, editor, changeList) {
             self._handleEditorChange(changeList);
@@ -332,24 +332,23 @@ define(function (require, exports, module) {
      * back-indenting it if so.
      */
     Editor.prototype._checkElectricChars = function (event) {
-        var instance = this._codeMirror;
-        if (event.type === "keypress") {
-            var keyStr = String.fromCharCode(event.which || event.keyCode);
-            if (/[\]\{\}\)]/.test(keyStr)) {
-                // If all text before the cursor is whitespace, auto-indent it
-                var cursor = this.getCursorPos();
-                var lineStr = instance.getLine(cursor.line);
-                var nonWS = lineStr.search(/\S/);
-                
-                if (nonWS === -1 || nonWS >= cursor.ch) {
-                    // Need to do the auto-indent on a timeout to ensure
-                    // the keypress is handled before auto-indenting.
-                    // This is the same timeout value used by the
-                    // electricChars feature in CodeMirror.
-                    window.setTimeout(function () {
-                        instance.indentLine(cursor.line);
-                    }, 75);
-                }
+        var instance = this._codeMirror,
+            keyStr = String.fromCharCode(event.which || event.keyCode);
+
+        if (/[\]\{\}\)]/.test(keyStr)) {
+            // If all text before the cursor is whitespace, auto-indent it
+            var cursor = this.getCursorPos();
+            var lineStr = instance.getLine(cursor.line);
+            var nonWS = lineStr.search(/\S/);
+
+            if (nonWS === -1 || nonWS >= cursor.ch) {
+                // Need to do the auto-indent on a timeout to ensure
+                // the keypress is handled before auto-indenting.
+                // This is the same timeout value used by the
+                // electricChars feature in CodeMirror.
+                window.setTimeout(function () {
+                    instance.indentLine(cursor.line);
+                }, 75);
             }
         }
     };
@@ -379,7 +378,7 @@ define(function (require, exports, module) {
      * Handle CodeMirror key events.
      * @param {!Event} event
      */
-    Editor.prototype._handleKeyEvents = function (event) {
+    Editor.prototype._handleKeypressEvents = function (event) {
         this._checkElectricChars(event);
     };
 
@@ -693,7 +692,8 @@ define(function (require, exports, module) {
 
         // Redispatch these CodeMirror key events as jQuery events
         function _onKeyEvent(instance, event) {
-            $(self).triggerHandler("keyEvent", [self, event]);
+            $(self).triggerHandler("keyEvent", [self, event]);  // deprecated
+            $(self).triggerHandler(event.type, [self, event]);
             return event.defaultPrevented;   // false tells CodeMirror we didn't eat the event
         }
         this._codeMirror.on("keydown",  _onKeyEvent);

src/extensions/default/JavaScriptCodeHints/ParameterHintManager.js

@@ -393,8 +393,8 @@ define(function (require, exports, module) {
      */
     function installListeners(editor) {
 
-        $(editor).on("keyEvent", function (jqEvent, editor, event) {
-            if (event.type === "keydown" && event.keyCode === KeyEvent.DOM_VK_ESCAPE) {
+        $(editor).on("keydown", function (jqEvent, editor, event) {
+            if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) {
                 dismissHint();
             }
         }).on("scroll", function () {