From d5086c5f781dfefac23d30a89256dd2e8ca22464 Mon Sep 17 00:00:00 2001
From: Jez Ng
Date: Sat, 4 Aug 2012 14:45:04 -0700
Subject: Convert 'getScrollPosition' from port to request.

---
 content_scripts/vimium_frontend.coffee | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'content_scripts')

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)
-- 
cgit v1.2.3