diff options
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 | ||||
| -rw-r--r-- | lib/dom_utils.coffee | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 0f42c65b..281cc978 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -1142,7 +1142,7 @@ CursorHider = initializePreDomReady() window.addEventListener("DOMContentLoaded", registerFrame) window.addEventListener("unload", unregisterFrame) -DomUtils.runWhenDOMLoaded initializeOnDomReady +DomUtils.documentReady initializeOnDomReady window.onbeforeunload = -> chrome.runtime.sendMessage( diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee index 762c6418..7a75dd6a 100644 --- a/lib/dom_utils.coffee +++ b/lib/dom_utils.coffee @@ -2,10 +2,11 @@ DomUtils = # # Runs :callback if the DOM has loaded, otherwise runs it on load # - documentReady: do -> - loaded = false - window.addEventListener("DOMContentLoaded", -> loaded = true) - (callback) -> if loaded then callback() else window.addEventListener("DOMContentLoaded", callback) + documentReady: (func) -> + if document.readyState == "loading" + window.addEventListener "DOMContentLoaded", func + else + func() # # Adds a list of elements to a page. @@ -178,12 +179,5 @@ DomUtils = event.preventDefault() @suppressPropagation(event) - # Calls func either now (if the DOM has already loaded), or when the DOM is loaded. - runWhenDOMLoaded: (func) -> - if document.readyState == "loading" - window.addEventListener "DOMContentLoaded", func - else - func() - root = exports ? window root.DomUtils = DomUtils |