diff options
| author | Stephen Blott | 2018-02-04 09:02:37 +0000 |
|---|---|---|
| committer | GitHub | 2018-02-04 09:02:37 +0000 |
| commit | a61b8202815373775ea2d068ee9ac30bace62ae0 (patch) | |
| tree | 8e63b099c307f19767417d670807740179217329 | |
| parent | 05774be991df4c645ef0a8ad0fe69cf7beb5fcc5 (diff) | |
| parent | d15f4a13c273934000173562cfa0f2b4c936c6f7 (diff) | |
| download | vimium-a61b8202815373775ea2d068ee9ac30bace62ae0.tar.bz2 | |
Merge pull request #2939 from smblott-github/disable-preload-vomnibar
Disable pre-loading of Vomnibar iframe.
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 594175ab..11310dcf 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -113,19 +113,6 @@ installModes = -> new GrabBackFocus if isEnabledForUrl normalMode # Return the normalMode object (for the tests). -initializeOnEnabledStateKnown = (isEnabledForUrl) -> - installModes() unless normalMode - if isEnabledForUrl - unless Utils.isFirefox() and document.documentElement.namespaceURI != "http://www.w3.org/1999/xhtml" - # We only initialize (and activate) the Vomnibar in the top frame. Also, we do not initialize the - # Vomnibar until we know that Vimium is enabled. Thereafter, there's no more initialization to do. - # - # NOTE(mrmr1993): In XML documents on Firefox, injecting HTML into the DOM breaks the rendering, so we - # lazy load the Vomnibar. This comes with the expected issues, but is better than breaking all XML - # documents. - DomUtils.documentComplete Vomnibar.init.bind Vomnibar if DomUtils.isTopFrame() - initializeOnEnabledStateKnown = -> - # # Complete initialization work that should be done prior to DOMReady. # @@ -305,7 +292,7 @@ checkIfEnabledForUrl = do -> Frame.addEventListener "isEnabledForUrl", (response) -> {isEnabledForUrl, passKeys, frameIsFocused, isFirefox} = response Utils.isFirefox = -> isFirefox - initializeOnEnabledStateKnown isEnabledForUrl + installModes() unless normalMode normalMode.setPassKeys passKeys # Hide the HUD if we're not enabled. HUD.hide true, false unless isEnabledForUrl |