From 232ac81def865fd59453f2e80b09f724f42c1ea9 Mon Sep 17 00:00:00 2001
From: Jez Ng
Date: Mon, 3 Sep 2012 12:51:08 -0400
Subject: Ignore content script requests in options page.

---
 content_scripts/vimium_frontend.coffee | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 54a3bb2e..4577be8c 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -115,6 +115,9 @@ initializePreDomReady = ->
     disableVimium: disableVimium
 
   chrome.extension.onRequest.addListener (request, sender, sendResponse) ->
+    # in the options page, we will receive requests from both content and background scripts. ignore those
+    # from the former.
+    return unless sender.tab?.url.startsWith 'chrome-extension://'
     sendResponse requestHandlers[request.name](request, sender)
     # Ensure the sendResponse callback is freed.
     false
-- 
cgit v1.2.3