From e4193e2752ee7132ff16a7ba977857f70df2946b Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 29 Feb 2016 06:31:43 +0000
Subject: Key bindings; tweaks.

---
 content_scripts/mode_key_handler.coffee | 10 +++++-----
 content_scripts/vimium_frontend.coffee  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode_key_handler.coffee b/content_scripts/mode_key_handler.coffee
index 60633895..8c4ded43 100644
--- a/content_scripts/mode_key_handler.coffee
+++ b/content_scripts/mode_key_handler.coffee
@@ -63,12 +63,12 @@ class KeyHandlerMode extends Mode
   handleKeyChar: (event, keyChar) ->
     bgLog "Handling key #{keyChar}, mode=#{@name}."
     @advanceKeyState keyChar
-    commands = @keyState.filter (entry) -> entry.command
-    if 0 < commands.length
-      countPrefix = if 0 < @countPrefix then @countPrefix else 1
+    command = (@keyState.filter (entry) -> entry.command)[0]
+    if command?
+      count = if 0 < @countPrefix then @countPrefix else 1
       @reset()
-      bgLog "Calling mode=#{@name}, command=#{commands[0].command}, count=#{countPrefix}."
-      @commandHandler command: commands[0], count: countPrefix, event: event
+      bgLog "Calling mode=#{@name}, command=#{command.command}, count=#{count}."
+      @commandHandler {command, count}
     false # Suppress event.
 
   # This returns the first key-state entry for which keyChar is mapped. The return value is truthy if a match
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 46b21ed0..a4dd6986 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -108,7 +108,7 @@ class NormalMode extends KeyHandlerMode
       if area == "local" and changes.normalModeKeyStateMapping?.newValue
         @setKeyMapping changes.normalModeKeyStateMapping.newValue
 
-  commandHandler: ({command: registryEntry, count, event}) ->
+  commandHandler: ({command: registryEntry, count}) ->
     count *= registryEntry.options.count ? 1
     count = 1 if registryEntry.noRepeat
 
-- 
cgit v1.2.3