aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts
diff options
context:
space:
mode:
authorJez Ng2012-08-04 14:45:04 -0700
committerJez Ng2012-08-04 14:45:04 -0700
commitd5086c5f781dfefac23d30a89256dd2e8ca22464 (patch)
tree77c7af40c1bef776ba83f0f637ab90ae24a2647f /content_scripts
parenta6116da5a03237fb1a3718060d972f1992618a99 (diff)
downloadvimium-d5086c5f781dfefac23d30a89256dd2e8ca22464.tar.bz2
Convert 'getScrollPosition' from port to request.
Diffstat (limited to 'content_scripts')
-rw-r--r--content_scripts/vimium_frontend.coffee15
1 files changed, 6 insertions, 9 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 21c366e9..8ba59b5c 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -119,9 +119,13 @@ initializePreDomReady = ->
focusThisFrame(request.highlight)
else if (request.name == "refreshCompletionKeys")
refreshCompletionKeys(request)
+ else if (request.name == "getScrollPosition")
+ sendResponse
+ scrollX: window.scrollX
+ scrollY: window.scrollY
- # Free up the resources used by this open connection.
- sendResponse({})
+ # Ensure the sendResponse callback is freed.
+ false
chrome.extension.onConnect.addListener (port, name) ->
if (port.name == "executePageCommand")
@@ -133,13 +137,6 @@ initializePreDomReady = ->
Utils.invokeCommandString(args.command) for i in [0...args.count]
refreshCompletionKeys(args)
- else if (port.name == "getScrollPosition")
- port.onMessage.addListener (args) ->
- scrollPort = chrome.extension.connect({ name: "returnScrollPosition" })
- scrollPort.postMessage
- scrollX: window.scrollX,
- scrollY: window.scrollY,
- currentTab: args.currentTab
else if (port.name == "setScrollPosition")
port.onMessage.addListener (args) ->
if (args.scrollX > 0 || args.scrollY > 0)