diff options
| author | Stephen Blott | 2016-04-18 05:39:01 +0100 |
|---|---|---|
| committer | Stephen Blott | 2016-04-18 05:39:01 +0100 |
| commit | 8846d04f3043e4be4be3d8e63c1efb46fe7e0b0e (patch) | |
| tree | be4e76270a1b0fdffc58c1a706cc4983e57b23d9 | |
| parent | c01d7eea8675f9a7d84999777e8de72244d687b6 (diff) | |
| download | vimium-8846d04f3043e4be4be3d8e63c1efb46fe7e0b0e.tar.bz2 | |
Revert "UI-compnent commands must wait for the document to be ready."
This reverts commit c01d7eea8675f9a7d84999777e8de72244d687b6.
Preparatory to implementing an alternative approach.
| -rw-r--r-- | content_scripts/hud.coffee | 16 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 5 | ||||
| -rw-r--r-- | content_scripts/vomnibar.coffee | 9 | ||||
| -rw-r--r-- | lib/dom_utils.coffee | 3 |
4 files changed, 13 insertions, 20 deletions
diff --git a/content_scripts/hud.coffee b/content_scripts/hud.coffee index 38c9ab9b..62bcf03f 100644 --- a/content_scripts/hud.coffee +++ b/content_scripts/hud.coffee @@ -23,17 +23,15 @@ HUD = @_showForDurationTimerId = setTimeout((=> @hide()), duration) show: (text) -> - DomUtils.ifDocumentIsReady => - @init() - clearTimeout(@_showForDurationTimerId) - @hudUI.activate {name: "show", text} - @tween.fade 1.0, 150 + @init() + clearTimeout(@_showForDurationTimerId) + @hudUI.activate {name: "show", text} + @tween.fade 1.0, 150 showFindMode: (@findMode = null) -> - DomUtils.ifDocumentIsReady => - @init() - @hudUI.activate name: "showFindMode" - @tween.fade 1.0, 150 + @init() + @hudUI.activate name: "showFindMode" + @tween.fade 1.0, 150 search: (data) -> @findMode.findInPlace data.query diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index d1ff874e..a80093f9 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -616,9 +616,8 @@ enterFindMode = -> new FindMode() window.showHelp = (sourceFrameId) -> - DomUtils.ifDocumentIsReady -> - chrome.runtime.sendMessage handler: "getHelpDialogHtml", (response) -> - HelpDialog.toggle {sourceFrameId, html: response} + chrome.runtime.sendMessage handler: "getHelpDialogHtml", (response) -> + HelpDialog.toggle {sourceFrameId, html: response} # If we are in the help dialog iframe, then HelpDialog is already defined with the necessary functions. window.HelpDialog ?= diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee index 292cedc7..cbd2892c 100644 --- a/content_scripts/vomnibar.coffee +++ b/content_scripts/vomnibar.coffee @@ -56,11 +56,10 @@ Vomnibar = # selectFirst - Optional, boolean. Whether to select the first entry. # newTab - Optional, boolean. Whether to open the result in a new tab. open: (sourceFrameId, options) -> - DomUtils.ifDocumentIsReady => - @init() - # The Vomnibar cannot coexist with the help dialog (it causes focus issues). - HelpDialog.abort() - @vomnibarUI.activate extend options, { name: "activate", sourceFrameId, focus: true } + @init() + # The Vomnibar cannot coexist with the help dialog (it causes focus issues). + HelpDialog.abort() + @vomnibarUI.activate extend options, { name: "activate", sourceFrameId, focus: true } root = exports ? window root.Vomnibar = Vomnibar diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee index 20392c83..3d719337 100644 --- a/lib/dom_utils.coffee +++ b/lib/dom_utils.coffee @@ -13,9 +13,6 @@ DomUtils = (callback) -> if isReady then callback() else callbacks.push callback - ifDocumentIsReady: (callback) -> - callback() unless document.readyState == "loading" - createElement: (tagName) -> element = document.createElement tagName if element instanceof HTMLElement |
