Merge branch 'modes-dev' into modes

1 files changed, 7 insertions, 8 deletions

diff --git a/content_scripts/mode_passkeys.coffee b/content_scripts/mode_passkeys.coffee
index 972dcad7..c4df06dc 100644
--- a/content_scripts/mode_passkeys.coffee
+++ b/content_scripts/mode_passkeys.coffee
@@ -3,24 +3,23 @@ class PassKeysMode extends Mode
   constructor: ->
     super
       name: "passkeys"
-      keydown: (event) => @handlePassKeyEvent event
-      keypress: (event) => @handlePassKeyEvent event
       trackState: true
+      keydown: (event) => @handleKeyChar KeyboardUtils.getKeyChar event
+      keypress: (event) => @handleKeyChar String.fromCharCode event.charCode
+      keyup: (event) => @handleKeyChar String.fromCharCode event.charCode
 
   # Decide whether this event should be passed to the underlying page.  Keystrokes are *never* considered
   # passKeys if the keyQueue is not empty.  So, for example, if 't' is a passKey, then 'gt' and '99t' will
   # neverthless be handled by vimium.
-  handlePassKeyEvent: (event) ->
-    for keyChar in [KeyboardUtils.getKeyChar(event), String.fromCharCode(event.charCode)]
-      return @stopBubblingAndTrue if keyChar and not @keyQueue and 0 <= @passKeys.indexOf(keyChar)
-    @continueBubbling
+  handleKeyChar: (keyChar) ->
+    @alwaysContinueBubbling =>
+      event.vimium_suppress_normal_mode = true if keyChar and not @keyQueue and 0 <= @passKeys.indexOf keyChar
 
   configure: (request) ->
     @keyQueue = request.keyQueue if request.keyQueue?
 
   chooseBadge: (badge) ->
-    @badge = if @passKeys and not @keyQueue then "P" else ""
-    super badge
+    badge.badge ||= "P" if @passKeys and not @keyQueue
 
 root = exports ? window
 root.PassKeysMode = PassKeysMode