aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts/vimium_frontend.coffee
diff options
context:
space:
mode:
authorStephen Blott2015-02-23 12:54:29 +0000
committerStephen Blott2015-02-23 12:54:29 +0000
commitb256d8463df4a68b096bf784c9f56899a7b7e57c (patch)
tree79324b519dfc01e77bbe09c583eb7cecdc951612 /content_scripts/vimium_frontend.coffee
parent14c46e12d385f65db5c905dc57de0b37f80cca7b (diff)
parent608f892402869b44f1a3d5d6843cf9ae164bd2ea (diff)
downloadvimium-b256d8463df4a68b096bf784c9f56899a7b7e57c.tar.bz2
Merge pull request #1505 from smblott-github/fix-incognito-and-find-history-initialisation
Ensure incognito-mode flag and find-mode-history are initialised.
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
-rw-r--r--content_scripts/vimium_frontend.coffee3
1 files changed, 2 insertions, 1 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 609b6b40..78901113 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
@@ -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())