From 91498d457f4398ab467fda4ec67b7444b1335cd3 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 1 Mar 2016 13:26:35 +0000
Subject: Key bindings; and yet more tiny tweaks.

---
 content_scripts/mode_key_handler.coffee | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode_key_handler.coffee b/content_scripts/mode_key_handler.coffee
index df177c4a..397e64c8 100644
--- a/content_scripts/mode_key_handler.coffee
+++ b/content_scripts/mode_key_handler.coffee
@@ -45,11 +45,10 @@ class KeyHandlerMode extends Mode
       @unlessKeyCharIsPassKey keyChar, =>
         @keydownEvents[event.keyCode] = true
         @handleKeyChar event, keyChar
-    else if keyChar
-      @continueBubbling
-    else if (keyChar = KeyboardUtils.getKeyChar event) and (@keyCharIsMapped(keyChar) or @isCountKey keyChar)
-      # It looks like we will possibly be handling a subsequent keypress event, so suppress propagation of
-      # this event to prevent triggering page event listeners (e.g. Google instant Search).
+    else if not keyChar and (keyChar = KeyboardUtils.getKeyChar event) and
+        (@keyCharIsMapped(keyChar) or @isCountKey keyChar)
+      # We will possibly be handling a subsequent keypress event, so suppress propagation of this event to
+      # prevent triggering page event listeners (e.g. Google instant Search).
       @unlessKeyCharIsPassKey keyChar, =>
         @keydownEvents[event.keyCode] = true
         DomUtils.suppressPropagation event
@@ -71,12 +70,10 @@ class KeyHandlerMode extends Mode
         @continueBubbling
 
   onKeyup: (event) ->
-    if event.keyCode of @keydownEvents
-      delete @keydownEvents[event.keyCode]
-      DomUtils.suppressPropagation event
-      @stopBubblingAndTrue
-    else
-      @continueBubbling
+    return @continueBubbling unless event.keyCode of @keydownEvents
+    delete @keydownEvents[event.keyCode]
+    DomUtils.suppressPropagation event
+    @stopBubblingAndTrue
 
   # This tests whether there is a mapping of keyChar in the current key state.
   keyCharIsMapped: (keyChar) ->
-- 
cgit v1.2.3