From cd8bd61fc24b3b9cb27e2386a8e1c34c740b9545 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 28 Apr 2015 12:08:07 +0100
Subject: Revert "Do not grab back focus if Vimium is disabled."

This reverts commit cfb137d515e6f214322538fdd9a8e236445b63b0.

Conflicts:
	content_scripts/vimium_frontend.coffee

There are HUD initialization issues with this.
---
 content_scripts/vimium_frontend.coffee | 6 +-----
 tests/dom_tests/dom_tests.coffee       | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 9b074487..bc1f7687 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -149,6 +149,7 @@ window.initializeModes = ->
   new NormalMode
   new PassKeysMode
   new InsertMode permanent: true
+  new GrabBackFocus
   Scroller.init settings
 
 #
@@ -158,8 +159,6 @@ 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()
@@ -230,10 +229,7 @@ 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()
-    # See note in ../tests/dom_tests/dom_tests.coffee re. window.runningDOMTests.
-    new GrabBackFocus if isEnabledForUrl and not window.runningDOMTests
 
 #
 # Whenever we get the focus:
diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee
index d6c3bfa2..bb09a0a8 100644
--- a/tests/dom_tests/dom_tests.coffee
+++ b/tests/dom_tests/dom_tests.coffee
@@ -1,8 +1,4 @@
 
-# FIXME(smblott) Getting everything initialized in the right order for both tests and live operation is
-# proving difficult.  Until we can figure it out, we tell the front end that we're running the DOM tests.
-window.runningDOMTests = true
-
 # Install frontend event handlers.
 installListeners()
 
-- 
cgit v1.2.3