Merge pull request #13241 from atom/revert-13233-ns-fix-ime

Revert "Forward compositionstart/end events to KeymapManager to avoid IME issues"

package.json

@@ -15,7 +15,7 @@
   "electronVersion": "1.3.6",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "7.2.0",
+    "atom-keymap": "7.1.4",
     "atom-space-pen-views": "^2.0.0",
     "atom-ui": "0.4.1",
     "babel-core": "5.8.38",

src/window-event-handler.coffee

@@ -14,8 +14,6 @@ class WindowEventHandler
 
     @addEventListener(@document, 'keyup', @handleDocumentKeyEvent)
     @addEventListener(@document, 'keydown', @handleDocumentKeyEvent)
-    @addEventListener(@document, 'compositionstart', @handleDocumentCompositionStartEvent)
-    @addEventListener(@document, 'compositionend', @handleDocumentCompositionEndEvent)
     @addEventListener(@document, 'drop', @handleDocumentDrop)
     @addEventListener(@document, 'dragover', @handleDocumentDragover)
     @addEventListener(@document, 'contextmenu', @handleDocumentContextmenu)
@@ -78,12 +76,6 @@ class WindowEventHandler
     @atomEnvironment.keymaps.handleKeyboardEvent(event)
     event.stopImmediatePropagation()
 
-  handleDocumentCompositionStartEvent: =>
-    @atomEnvironment.keymaps.handleCompositionStart()
-
-  handleDocumentCompositionEndEvent: =>
-    @atomEnvironment.keymaps.handleCompositionEnd()
-
   handleDrop: (event) ->
     event.preventDefault()
     event.stopPropagation()