From 731d45a8e8faf1f209632d5093bef5b554e26bb6 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 21 Feb 2015 06:45:54 +0000
Subject: Ensure inconito mode flag and find-mode-history are initialised.

See #1495.
---
 content_scripts/vimium_frontend.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 609b6b40..28c1f092 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -211,13 +211,13 @@ window.initializeWhenEnabled = ->
       do (type) -> installListener window, type, (event) -> handlerStack.bubbleEvent type, event
     installListener document, "DOMActivate", (event) -> handlerStack.bubbleEvent 'DOMActivate', event
     installedListeners = true
+    FindModeHistory.init()
 
 setState = (request) ->
   isEnabledForUrl = request.enabled
   passKeys = request.passKeys
   isIncognitoMode = request.incognito
   initializeWhenEnabled() if isEnabledForUrl
-  FindModeHistory.init()
   handlerStack.bubbleEvent "registerStateChange",
     enabled: isEnabledForUrl
     passKeys: passKeys
-- 
cgit v1.2.3


From 608f892402869b44f1a3d5d6843cf9ae164bd2ea Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 23 Feb 2015 12:53:17 +0000
Subject: Ensure inconito mode flag and find-mode-history are initialised.

.. and don't forget to actually use the incognitomode flag in the front
   end.
---
 content_scripts/vimium_frontend.coffee | 1 +
 1 file changed, 1 insertion(+)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 28c1f092..78901113 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -562,6 +562,7 @@ checkIfEnabledForUrl = ->
   chrome.runtime.sendMessage { handler: "isEnabledForUrl", url: url }, (response) ->
     isEnabledForUrl = response.isEnabledForUrl
     passKeys = response.passKeys
+    isIncognitoMode = response.incognito
     if isEnabledForUrl
       initializeWhenEnabled()
     else if (HUD.isReady())
-- 
cgit v1.2.3