diff options
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 | ||||
| -rw-r--r-- | tests/dom_tests/dom_tests.coffee | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 447f7cc1..a21beb27 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -232,7 +232,7 @@ window.installListeners = -> installedListeners = true # Other one-time initialization operations. FindModeHistory.init() - new GrabBackFocus if isEnabledForUrl + new GrabBackFocus if isEnabledForUrl and not runningDOMTests # # Whenever we get the focus: diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee index bb09a0a8..d6c3bfa2 100644 --- a/tests/dom_tests/dom_tests.coffee +++ b/tests/dom_tests/dom_tests.coffee @@ -1,4 +1,8 @@ +# 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() |