Stop link hints from handling shift incorrectly

philc · Nov 20, 2014 · af7acb1 · af7acb1
1 parent d1220f3
commit af7acb1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
@@ -196,12 +196,12 @@ LinkHints =
       else # event.keyCode == keyCodes.ctrlKey
         @setOpenLinkMode(if @mode is OPEN_IN_NEW_FG_TAB then OPEN_IN_NEW_BG_TAB else OPEN_IN_NEW_FG_TAB)
 
-    if event.keyCode == KeyboardUtils.keyCodes.space
-      rotateOverlappingMarkers(hintMarkers, yes)
+    else if event.keyCode == keyCodes.space
+      rotateOverlappingMarkers(hintMarkers, not event.shiftKey)
       return
 
     # TODO(philc): Ignore keys that have modifiers.
-    if (KeyboardUtils.isEscape(event))
+    else if (KeyboardUtils.isEscape(event))
       @deactivateMode()
     else
       keyResult = @getMarkerMatcher().matchHintsByKey(hintMarkers, event)

diff --git a/lib/keyboard_utils.coffee b/lib/keyboard_utils.coffee
@@ -46,7 +46,9 @@ KeyboardUtils =
       correctedIdentifiers = @keyIdentifierCorrectionMap[keyIdentifier]
       keyIdentifier = if event.shiftKey then correctedIdentifiers[1] else correctedIdentifiers[0]
     unicodeKeyInHex = "0x" + keyIdentifier.substring(2)
-    character = String.fromCharCode(parseInt(unicodeKeyInHex)).toLowerCase()
+    keyCode = parseInt(unicodeKeyInHex)
+    return "" unless keyCode < 128
+    character = String.fromCharCode(keyCode).toLowerCase()
     if event.shiftKey then character.toUpperCase() else character
 
   isPrimaryModifierKey: (event) -> if (@platform == "Mac") then event.metaKey else event.ctrlKey