diff options
| author | Phil Crosby | 2013-09-16 12:06:18 -0700 |
|---|---|---|
| committer | Phil Crosby | 2013-09-16 12:06:18 -0700 |
| commit | 6708ddac3655c92f0ef385562c46d6b5e0d047a8 (patch) | |
| tree | ba4902e0c52e01ba915290d0a3319153d98ce3e8 /background_scripts | |
| parent | fabfc23f893ff208dd346f27744d92984dbe6052 (diff) | |
| parent | 9278d262c56301e997ccb214814543f64c7ba30b (diff) | |
| download | vimium-6708ddac3655c92f0ef385562c46d6b5e0d047a8.tar.bz2 | |
Merge pull request #912 from maksimr/master
Changed deprecated chrome.extension on chrome.runtime [Chromium v29] (fixed #908)
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/main.coffee | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index c585c265..f564f477 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -33,7 +33,7 @@ completers = bookmarks: new MultiCompleter([completionSources.bookmarks]) tabs: new MultiCompleter([completionSources.tabs]) -chrome.extension.onConnect.addListener((port, name) -> +chrome.runtime.onConnect.addListener((port, name) -> senderTabId = if port.sender.tab then port.sender.tab.id else null # If this is a tab we've been waiting to open, execute any "tab loaded" handlers, e.g. to restore # the tab's scroll position. Wait until domReady before doing this; otherwise operations like restoring @@ -54,7 +54,7 @@ chrome.extension.onConnect.addListener((port, name) -> port.onMessage.addListener(portHandlers[port.name]) ) -chrome.extension.onMessage.addListener((request, sender, sendResponse) -> +chrome.runtime.onMessage.addListener((request, sender, sendResponse) -> if (sendRequestHandlers[request.handler]) sendResponse(sendRequestHandlers[request.handler](request, sender)) # Ensure the sendResponse callback is freed. @@ -138,7 +138,7 @@ helpDialogHtmlForCommandGroup = (group, commandsToKey, availableCommands, # fetchFileContents = (extensionFileName) -> req = new XMLHttpRequest() - req.open("GET", chrome.extension.getURL(extensionFileName), false) # false => synchronous + req.open("GET", chrome.runtime.getURL(extensionFileName), false) # false => synchronous req.send() req.responseText @@ -528,7 +528,7 @@ shouldShowUpgradeMessage = -> openOptionsPageInNewTab = -> chrome.tabs.getSelected(null, (tab) -> - chrome.tabs.create({ url: chrome.extension.getURL("pages/options.html"), index: tab.index + 1 })) + chrome.tabs.create({ url: chrome.runtime.getURL("pages/options.html"), index: tab.index + 1 })) registerFrame = (request, sender) -> unless framesForTab[sender.tab.id] @@ -573,7 +573,7 @@ sendRequestHandlers = gotoMark: Marks.goto.bind(Marks) # Convenience function for development use. -window.runTests = -> open(chrome.extension.getURL('tests/dom_tests/dom_tests.html')) +window.runTests = -> open(chrome.runtime.getURL('tests/dom_tests/dom_tests.html')) # # Begin initialization. |