Use isModifierKey everywhere

jinzhu · Mar 27, 2014 · 63e0ea0 · 63e0ea0
1 parent fabeb3f
commit 63e0ea0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/coffee/frontend/cmds.coffee b/coffee/frontend/cmds.coffee
@@ -3,8 +3,8 @@ CancelKey     = ['<Esc>', '<C-[>']
 CtrlAcceptKey = ['<C-Enter>']
 CtrlEscapeKey = ['<C-Esc>']
 
-window.isControlKey = (key) ->
-  key in ['Control', 'Shift', 'Alt', 'Win']
+window.isModifierKey = (key) ->
+  key in ['Control', 'Shift', 'Alt', 'Win', 'Meta']
 
 window.isCtrlAcceptKey = (key) ->
   key in CtrlAcceptKey

diff --git a/coffee/frontend/modules/get-key.coffee b/coffee/frontend/modules/get-key.coffee
@@ -114,7 +114,7 @@ specialKeys["F#{key}"] = null for key in [1..12]
 
 window.getKey = (evt) ->
   evt = evt.originalEvent or evt
-  return evt.keyIdentifier if evt.keyIdentifier in ['Control', 'Alt', 'Meta', 'Shift']
+  return evt.keyIdentifier if isModifierKey evt.keyIdentifier
 
   key = keyId[evt.keyIdentifier] or evt.keyIdentifier
 

diff --git a/coffee/frontend/modules/key-event.coffee b/coffee/frontend/modules/key-event.coffee
@@ -139,7 +139,7 @@ class window.KeyEvent
 
     # If Vrome in pass-next or disabled mode and using <C-Esc> to enable it.
     return @enable() if not insertMode and (passNextKey or (disableVrome and isCtrlEscapeKey(key)))
-    return @stopPropagation e if key in ['Control', 'Alt', 'Shift']
+    return @stopPropagation e if isModifierKey key
     return if disableVrome
 
     currentKeys = filterKey currentKeys.concat(key), insertMode

diff --git a/coffee/frontend/modules/search.coffee b/coffee/frontend/modules/search.coffee
@@ -34,7 +34,7 @@ class window.Search
   handleInput = (e) =>
     return unless searchMode
     key = getKey e
-    @removeHighlights() unless key is 'Enter' or isControlKey key
+    @removeHighlights() unless key is 'Enter' or isModifierKey key
     lastSearch =
       text:      CmdBox.get().content
       position:  0