From cfb137d515e6f214322538fdd9a8e236445b63b0 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 28 Apr 2015 05:46:11 +0100
Subject: Do not grab back focus if Vimium is disabled.

---
 content_scripts/vimium_frontend.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index e7aea163..b322af53 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -149,7 +149,6 @@ window.initializeModes = ->
   new NormalMode
   new PassKeysMode
   new InsertMode permanent: true
-  new GrabBackFocus
   Scroller.init settings
 
 #
@@ -159,6 +158,8 @@ initializePreDomReady = ->
   settings.addEventListener("load", LinkHints.init.bind(LinkHints))
   settings.load()
 
+  # Note. checkIfEnabledForUrl() must come after initializeModes(), here, because checkIfEnabledForUrl() may
+  # install an additional mode (GrabBackFocus).
   initializeModes()
   checkIfEnabledForUrl()
   refreshCompletionKeys()
@@ -229,7 +230,9 @@ window.installListeners = ->
       do (type) -> installListener window, type, (event) -> handlerStack.bubbleEvent type, event
     installListener document, "DOMActivate", (event) -> handlerStack.bubbleEvent 'DOMActivate', event
     installedListeners = true
+    # Other one-time initialization operations.
     FindModeHistory.init()
+    new GrabBackFocus if isEnabledForUrl
 
 #
 # Whenever we get the focus:
-- 
cgit v1.2.3