aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2015-06-04 16:36:00 +0100
committerStephen Blott2015-06-04 16:38:22 +0100
commit89c3ab075994de9b11952784eb5752da445df576 (patch)
tree2197f6e917dbeb782f707b9bbc5c297273a0487b
parent2473475367411fdeb051a6752d0059e337ad09e3 (diff)
downloadvimium-89c3ab075994de9b11952784eb5752da445df576.tar.bz2
Unwind passing key and registry entry for marks.
As suggested by @mrmr1993 in #1716.
-rw-r--r--background_scripts/commands.coffee2
-rw-r--r--content_scripts/vimium_frontend.coffee4
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]