From 8136b79e10f223fe7854323d9e06a2488291f797 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 27 Apr 2015 15:27:10 +0100
Subject: It's not a passkey with Ctrl, Alt or Meta.

Fixes #1586.
---
 content_scripts/mode_passkeys.coffee | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode_passkeys.coffee b/content_scripts/mode_passkeys.coffee
index cf74a844..1ed69ac2 100644
--- a/content_scripts/mode_passkeys.coffee
+++ b/content_scripts/mode_passkeys.coffee
@@ -4,13 +4,14 @@ class PassKeysMode extends Mode
     super
       name: "passkeys"
       trackState: true # Maintain @enabled, @passKeys and @keyQueue.
-      keydown: (event) => @handleKeyChar KeyboardUtils.getKeyChar event
-      keypress: (event) => @handleKeyChar String.fromCharCode event.charCode
-      keyup: (event) => @handleKeyChar KeyboardUtils.getKeyChar event
+      keydown: (event) => @handleKeyChar event, KeyboardUtils.getKeyChar event
+      keypress: (event) => @handleKeyChar event, String.fromCharCode event.charCode
+      keyup: (event) => @handleKeyChar event, KeyboardUtils.getKeyChar event
 
   # 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.
-  handleKeyChar: (keyChar) ->
+  handleKeyChar: (event, keyChar) ->
+    return @continueBubbling if event.altKey or event.ctrlKey or event.metaKey
     if keyChar and not @keyQueue and 0 <= @passKeys.indexOf keyChar
       @stopBubblingAndTrue
     else
-- 
cgit v1.2.3