diff options
| -rw-r--r-- | content_scripts/link_hints.coffee | 4 | ||||
| -rw-r--r-- | lib/keyboard_utils.coffee | 3 | ||||
| -rw-r--r-- | pages/hud.coffee | 2 | ||||
| -rw-r--r-- | pages/vomnibar.coffee | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee index 4481ae92..a95d2123 100644 --- a/content_scripts/link_hints.coffee +++ b/content_scripts/link_hints.coffee @@ -175,7 +175,7 @@ class LinkHintsMode @hintMode.onExit (event) => if event?.type == "click" or (event?.type == "keydown" and - (KeyboardUtils.isEscape(event) or event.key in ["Backspace", "Delete"])) + (KeyboardUtils.isEscape(event) or KeyboardUtils.isBackspace event)) HintCoordinator.sendMessage "exit", isSuccess: false # Note(philc): Append these markers as top level children instead of as child nodes to the link itself, @@ -266,7 +266,7 @@ class LinkHintsMode # Therefore, we ensure that it's always removed when hint mode exits. See #1911 and #1926. @hintMode.onExit -> handlerStack.remove handlerId - else if event.key in [ "Backspace", "Delete" ] + else if KeyboardUtils.isBackspace event if @markerMatcher.popKeyChar() @updateVisibleMarkers() else diff --git a/lib/keyboard_utils.coffee b/lib/keyboard_utils.coffee index 1a1524af..35e584e3 100644 --- a/lib/keyboard_utils.coffee +++ b/lib/keyboard_utils.coffee @@ -49,6 +49,9 @@ KeyboardUtils = # <c-[> is mapped to Escape in Vim by default. event.key == "Escape" || @getKeyCharString(event) == "<c-[>" + isBackspace: (event) -> + event.key in ["Backspace", "Delete"] + isPrintable: (event) -> return false if event.metaKey or event.ctrlKey or event.altKey keyChar = diff --git a/pages/hud.coffee b/pages/hud.coffee index 98801930..ac7059ec 100644 --- a/pages/hud.coffee +++ b/pages/hud.coffee @@ -16,7 +16,7 @@ document.addEventListener "keydown", (event) -> inputElement = document.getElementById "hud-find-input" return unless inputElement? # Don't do anything if we're not in find mode. - if (event.key in ["Backspace", "Delete"] and inputElement.textContent.length == 0) or + if (KeyboardUtils.isBackspace(event) and inputElement.textContent.length == 0) or event.key == "Enter" or KeyboardUtils.isEscape event UIComponentServer.postMessage diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee index edd5fbc9..071604b7 100644 --- a/pages/vomnibar.coffee +++ b/pages/vomnibar.coffee @@ -116,7 +116,7 @@ class VomnibarUI return "down" else if (event.key == "Enter") return "enter" - else if event.key in ["Backspace", "Delete"] + else if KeyboardUtils.isBackspace event return "delete" null |