From 9ce07ada32883ac75a1d7436c026a846628181c8 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 12 Jan 2015 11:47:56 +0000
Subject: Fix race condition on the options page.

Fixes #1426.
---
 content_scripts/vimium_frontend.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 351a2690..0f42c65b 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)
-window.addEventListener("DOMContentLoaded", initializeOnDomReady)
+DomUtils.runWhenDOMLoaded initializeOnDomReady
 
 window.onbeforeunload = ->
   chrome.runtime.sendMessage(
-- 
cgit v1.2.3


From 4504b78613b4a68b838dd887c8b23ec5a71fe779 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 12 Jan 2015 11:55:20 +0000
Subject: Fix race condition on the options page (better).

Uses document.readyState for all onDOMContentLoaded dependent functions.

This should fix the same race condition as #1426 for all cases.
---
 content_scripts/vimium_frontend.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content_scripts')

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(
-- 
cgit v1.2.3


From 2e8acc1fcd8661fc3f14d86cbf4329b4fc7f843d Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 12 Jan 2015 11:59:30 +0000
Subject: Fix race condition on the options page (better still). a

---
 content_scripts/vimium_frontend.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 281cc978..a3ab051b 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -1140,9 +1140,9 @@ CursorHider =
     window.addEventListener "scroll", @onScroll
 
 initializePreDomReady()
-window.addEventListener("DOMContentLoaded", registerFrame)
-window.addEventListener("unload", unregisterFrame)
 DomUtils.documentReady initializeOnDomReady
+DomUtils.documentReady registerFrame
+window.addEventListener "unload", unregisterFrame
 
 window.onbeforeunload = ->
   chrome.runtime.sendMessage(
-- 
cgit v1.2.3