From 89c3ab075994de9b11952784eb5752da445df576 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Thu, 4 Jun 2015 16:36:00 +0100
Subject: Unwind passing key and registry entry for marks.

As suggested by @mrmr1993 in #1716.
---
 background_scripts/commands.coffee     | 2 +-
 content_scripts/vimium_frontend.coffee | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index b9ab274c..64ec36be 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -30,7 +30,7 @@ Commands =
       return
 
     options ?= []
-    @keyToCommandRegistry[key] = extend { command, options, key }, @availableCommands[command]
+    @keyToCommandRegistry[key] = extend { command, options }, @availableCommands[command]
 
   # Lower-case the appropriate portions of named keys.
   #
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 033bb2b3..3055ecea 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -255,9 +255,7 @@ executePageCommand = (request) ->
   # All other commands are handled in their frame (but only if Vimium is enabled).
   return unless frameId == request.frameId and isEnabledForUrl
 
-  if commandType == "Marks"
-    Utils.invokeCommandString request.command, [request.registryEntry]
-  else if request.registryEntry.passCountToFunction
+  if request.registryEntry.passCountToFunction
     Utils.invokeCommandString(request.command, [request.count])
   else
     Utils.invokeCommandString(request.command) for i in [0...request.count]
-- 
cgit v1.2.3