diff options
| author | Stephen Blott | 2015-05-29 10:30:25 +0100 |
|---|---|---|
| committer | Stephen Blott | 2015-05-29 10:31:12 +0100 |
| commit | 17e233a2bdbb725a14b9aa363ed659a5bd9feeb2 (patch) | |
| tree | 708d490d2b985dbf65cb24d81d7a4fbcb204ff06 | |
| parent | 4fc96415b0e01d7b0a68f74578ab9c69d5a0dd1a (diff) | |
| download | vimium-17e233a2bdbb725a14b9aa363ed659a5bd9feeb2.tar.bz2 | |
Pass command's registry entry to content script.
| -rw-r--r-- | background_scripts/main.coffee | 14 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index a13d9d98..e7a1f82c 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -558,13 +558,13 @@ checkKeyQueue = (keysToCheck, tabId, frameId) -> if runCommand if not registryEntry.isBackgroundCommand - chrome.tabs.sendMessage(tabId, - name: "executePageCommand", - command: registryEntry.command, - frameId: frameId, - count: count, - passCountToFunction: registryEntry.passCountToFunction, - completionKeys: generateCompletionKeys("")) + chrome.tabs.sendMessage tabId, + name: "executePageCommand" + command: registryEntry.command + frameId: frameId + count: count + completionKeys: generateCompletionKeys "" + registryEntry: registryEntry refreshedCompletionKeys = true else if registryEntry.passCountToFunction diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 41fb772b..6b27924d 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -314,7 +314,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 (request.passCountToFunction) + if request.registryEntry.passCountToFunction Utils.invokeCommandString(request.command, [request.count]) else Utils.invokeCommandString(request.command) for i in [0...request.count] |