diff options
| author | Stephen Blott | 2017-04-18 05:47:15 +0100 |
|---|---|---|
| committer | GitHub | 2017-04-18 05:47:15 +0100 |
| commit | 8058a54fd5a6a2f0e1a62a3a66f837a07045396e (patch) | |
| tree | a7e0949cd41b8fa8d03fa27140f8b815ec1d64c4 /background_scripts | |
| parent | 84723d7561d0cc12f54a6d388dcd505ddd6105ac (diff) | |
| parent | b0fc681480da40ec0bdb43773275ef7181c78cf1 (diff) | |
| download | vimium-8058a54fd5a6a2f0e1a62a3a66f837a07045396e.tar.bz2 | |
Merge pull request #2476 from mrmr1993/firefox
Improve firefox support
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/main.coffee | 9 | ||||
| -rw-r--r-- | background_scripts/marks.coffee | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index 70739eae..4fb754f8 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -101,8 +101,13 @@ TabOperations = index: request.tab.index + 1 active: true windowId: request.tab.windowId - openerTabId: request.tab.id - chrome.tabs.create tabConfig, callback + chrome.tabs.create tabConfig, (tab) -> + # NOTE(mrmr1993, 2017-02-08): Firefox currently doesn't support openerTabId (issue 1238314) and throws + # a type error if it is present. We work around this by attempting to set it separately from creating + # the tab. + try chrome.tabs.update tab.id, { openerTabId : request.tab.id }, callback + catch + callback.apply this, arguments toggleMuteTab = do -> muteTab = (tab) -> chrome.tabs.update tab.id, {muted: !tab.mutedInfo.muted} diff --git a/background_scripts/marks.coffee b/background_scripts/marks.coffee index 33c467a7..a6491b9e 100644 --- a/background_scripts/marks.coffee +++ b/background_scripts/marks.coffee @@ -30,7 +30,7 @@ Marks = saveMark: (markInfo) -> item = {} item[@getLocationKey markInfo.markName] = markInfo - chrome.storage.sync.set item + Settings.storage.set item # Goto a global mark. We try to find the original tab. If we can't find that, then we try to find another # tab with the original URL, and use that. And if we can't find such an existing tab, then we create a new @@ -39,7 +39,7 @@ Marks = chrome.storage.local.get "vimiumSecret", (items) => vimiumSecret = items.vimiumSecret key = @getLocationKey req.markName - chrome.storage.sync.get key, (items) => + Settings.storage.get key, (items) => markInfo = items[key] if markInfo.vimiumSecret != vimiumSecret # This is a different Vimium instantiation, so markInfo.tabId is definitely out of date. |