aboutsummaryrefslogtreecommitdiffstats
path: root/background_scripts
diff options
context:
space:
mode:
authorStephen Blott2016-02-27 16:40:38 +0000
committerStephen Blott2016-03-05 05:37:40 +0000
commita881ade2023a6e602097b0ae28c515fc3e9c5e8a (patch)
tree25d0e16b654bd0e4b897c12b2bb8bd25f375df4c /background_scripts
parent560112448d00fc9c69c9db03de8fdd5412c700dc (diff)
downloadvimium-a881ade2023a6e602097b0ae28c515fc3e9c5e8a.tar.bz2
Key bindings; rewire vomnibar (fix minor error).
Diffstat (limited to 'background_scripts')
-rw-r--r--background_scripts/commands.coffee1
-rw-r--r--background_scripts/main.coffee2
2 files changed, 2 insertions, 1 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index a62c674e..a82a6dcb 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -374,6 +374,7 @@ commandDescriptions =
moveTabLeft: ["Move tab to the left", { background: true, passCountToFunction: true }]
moveTabRight: ["Move tab to the right", { background: true, passCountToFunction: true }]
+ # These are background-page commands because all requests go via the background page.
"Vomnibar.activate": ["Open URL, bookmark, or history entry", { background: true, noRepeat: true }]
"Vomnibar.activateInNewTab": ["Open URL, bookmark, history entry, in a new tab", { background: true, noRepeat: true }]
"Vomnibar.activateTabSelection": ["Search through your open tabs", { background: true, noRepeat: true }]
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 8d2b4248..7975ec6d 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -379,7 +379,7 @@ openVomnibar = (tabId, frameId, registryEntry) ->
runBackgroundCommand = ({frameId, registryEntry, count}, sender) ->
if registryEntry.command.split(".")[0] == "Vomnibar"
openVomnibar sender.tab.id, frameId, registryEntry
- if registryEntry.passCountToFunction
+ else if registryEntry.passCountToFunction
BackgroundCommands[registryEntry.command] count, frameId
else if registryEntry.noRepeat
BackgroundCommands[registryEntry.command] frameId