aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--background_scripts/main.coffee10
-rw-r--r--content_scripts/link_hints.coffee4
-rw-r--r--content_scripts/marks.coffee4
-rw-r--r--content_scripts/vomnibar.coffee10
-rw-r--r--pages/popup.coffee2
-rw-r--r--test_harnesses/vomnibar.html2
-rw-r--r--tests/dom_tests/chrome.coffee4
7 files changed, 17 insertions, 19 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.
diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index 302acaac..f2479d0f 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -91,12 +91,12 @@ LinkHints =
else if @mode is COPY_LINK_URL
HUD.show("Copy link URL to Clipboard")
@linkActivator = (link) ->
- chrome.extension.sendMessage({handler: "copyToClipboard", data: link.href})
+ chrome.runtime.sendMessage({handler: "copyToClipboard", data: link.href})
else if @mode is OPEN_INCOGNITO
HUD.show("Open link in incognito window")
@linkActivator = (link) ->
- chrome.extension.sendMessage(
+ chrome.runtime.sendMessage(
handler: 'openUrlInIncognito'
url: link.href)
else # OPEN_IN_CURRENT_TAB
diff --git a/content_scripts/marks.coffee b/content_scripts/marks.coffee
index 91701936..316ab951 100644
--- a/content_scripts/marks.coffee
+++ b/content_scripts/marks.coffee
@@ -6,7 +6,7 @@ root.activateCreateMode = ->
return unless keyChar isnt ""
if /[A-Z]/.test keyChar
- chrome.extension.sendMessage {
+ chrome.runtime.sendMessage {
handler: 'createMark',
markName: keyChar
scrollX: window.scrollX,
@@ -29,7 +29,7 @@ root.activateGotoMode = ->
return unless keyChar isnt ""
if /[A-Z]/.test keyChar
- chrome.extension.sendMessage
+ chrome.runtime.sendMessage
handler: 'gotoMark'
markName: keyChar
else if /[a-z]/.test keyChar
diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee
index b8c28bcb..6782ab28 100644
--- a/content_scripts/vomnibar.coffee
+++ b/content_scripts/vomnibar.coffee
@@ -115,7 +115,7 @@ class VomnibarUI
# <Enter> on an empty vomnibar is a no-op.
return unless 0 < query.length
@hide()
- chrome.extension.sendMessage({
+ chrome.runtime.sendMessage({
handler: if openInNewTab then "openUrlInNewTab" else "openUrlInCurrentTab"
url: query })
else
@@ -186,9 +186,9 @@ class BackgroundCompleter
# - name: The background page completer that you want to interface with. Either "omni", "tabs", or
# "bookmarks". */
constructor: (@name) ->
- @filterPort = chrome.extension.connect({ name: "filterCompleter" })
+ @filterPort = chrome.runtime.connect({ name: "filterCompleter" })
- refresh: -> chrome.extension.sendMessage({ handler: "refreshCompleter", name: @name })
+ refresh: -> chrome.runtime.sendMessage({ handler: "refreshCompleter", name: @name })
filter: (query, callback) ->
id = Utils.createUniqueId()
@@ -220,12 +220,12 @@ extend BackgroundCompleter,
script.textContent = decodeURIComponent(url["javascript:".length..])
(document.head || document.documentElement).appendChild script
else
- chrome.extension.sendMessage(
+ chrome.runtime.sendMessage(
handler: if openInNewTab then "openUrlInNewTab" else "openUrlInCurrentTab"
url: url,
selected: openInNewTab)
- switchToTab: (tabId) -> chrome.extension.sendMessage({ handler: "selectSpecificTab", id: tabId })
+ switchToTab: (tabId) -> chrome.runtime.sendMessage({ handler: "selectSpecificTab", id: tabId })
root = exports ? window
root.Vomnibar = Vomnibar
diff --git a/pages/popup.coffee b/pages/popup.coffee
index 0bac6ca7..6d7afafc 100644
--- a/pages/popup.coffee
+++ b/pages/popup.coffee
@@ -1,5 +1,5 @@
onLoad = ->
- document.getElementById("optionsLink").setAttribute "href", chrome.extension.getURL("pages/options.html")
+ document.getElementById("optionsLink").setAttribute "href", chrome.runtime.getURL("pages/options.html")
chrome.tabs.getSelected null, (tab) ->
# The common use case is to disable Vimium at the domain level.
# This regexp will match "http://www.example.com/" from "http://www.example.com/path/to/page.html".
diff --git a/test_harnesses/vomnibar.html b/test_harnesses/vomnibar.html
index f9528548..f484279e 100644
--- a/test_harnesses/vomnibar.html
+++ b/test_harnesses/vomnibar.html
@@ -26,7 +26,7 @@
onMessage: { addListener: function(callback) { } },
postMessage: function() { }
};
- window.chrome.extension = {
+ window.chrome.runtime = {
connect: function() { return port; },
sendRequest: function() { },
};
diff --git a/tests/dom_tests/chrome.coffee b/tests/dom_tests/chrome.coffee
index 71d0c572..7f99e27f 100644
--- a/tests/dom_tests/chrome.coffee
+++ b/tests/dom_tests/chrome.coffee
@@ -5,7 +5,7 @@
root = exports ? window
root.chrome = {
- extension: {
+ runtime: {
connect: -> {
onMessage: {
addListener: ->
@@ -16,8 +16,6 @@ root.chrome = {
addListener: ->
}
sendMessage: ->
- }
- runtime: {
getManifest: ->
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 15:04:16 +0000