diff options
| author | Stephen Blott | 2016-03-12 12:00:03 +0000 |
|---|---|---|
| committer | Stephen Blott | 2016-03-28 05:44:54 +0100 |
| commit | c8414d92886c7705dc0892cdedf3939f75336889 (patch) | |
| tree | 48f13f6756b554767b21ec22c43fbbe4c0059e21 | |
| parent | 409d1c69acb61ba6ac7ff7981fd8eb0354ba548f (diff) | |
| download | vimium-c8414d92886c7705dc0892cdedf3939f75336889.tar.bz2 | |
Global link hints; rename message name.
We cannot use "request" and "name" to describe a link-hints message.
The message is then accepted (and fails) on the options page where there
is no handler.
So, here, use "messageType" instead of "name".
| -rw-r--r-- | background_scripts/main.coffee | 10 | ||||
| -rw-r--r-- | content_scripts/link_hints.coffee | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index 44bb4e4a..883a9afc 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -323,14 +323,14 @@ HintCoordinator = tabState: {} onMessage: (request, sender) -> - if request.name of this - this[request.name] extend request, tabId: sender.tab.id + if request.messageType of this + this[request.messageType] extend request, tabId: sender.tab.id else # The message is not for us. It's for all frames, so we bounce it there. - @sendMessage request.name, sender.tab.id, request + @sendMessage request.messageType, sender.tab.id, request - sendMessage: (handler, tabId, request = {}) -> - chrome.tabs.sendMessage tabId, extend request, {name: "linkHintsMessage", handler} + sendMessage: (messageType, tabId, request = {}) -> + chrome.tabs.sendMessage tabId, extend request, {name: "linkHintsMessage", messageType} activateMode: ({tabId, frameId, modeIndex}) -> @tabState[tabId] = {frameIds: frameIdsForTab[tabId], hints: [], modeIndex, frameId} diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee index 764944ee..e695e869 100644 --- a/content_scripts/link_hints.coffee +++ b/content_scripts/link_hints.coffee @@ -52,8 +52,8 @@ availableModes = [OPEN_IN_CURRENT_TAB, OPEN_IN_NEW_BG_TAB, OPEN_IN_NEW_FG_TAB, O HintCoordinator = onExit: [] - sendMessage: (name, request = {}) -> - chrome.runtime.sendMessage extend request, {handler: "linkHintsMessage", name, frameId} + sendMessage: (messageType, request = {}) -> + chrome.runtime.sendMessage extend request, {handler: "linkHintsMessage", messageType, frameId} activateMode: (mode, onExit) -> @onExit = [onExit] |