refactor(js/profile-w3c-common): DOMready

w3c · Jun 22, 2017 · 78ca7b8 · 78ca7b8
1 parent cc02b86
commit 78ca7b8
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/js/profile-w3c-common.js b/js/profile-w3c-common.js
@@ -3,13 +3,9 @@
 if (document.body) {
   document.body.hidden = true;
 } else {
-  document.addEventListener(
-    "DOMContentLoaded",
-    function() {
-      document.body.hidden = true;
-    },
-    { once: true }
-  );
+  document.addEventListener("DOMContentLoaded", function() {
+    document.body.hidden = true;
+  });
 }
 
 // In case everything else fails, we always want to show the document
@@ -41,9 +37,16 @@ require.config({
 });
 
 const domReady = new Promise(function(resolve) {
-  return document.readyState === "complete"
-    ? resolve()
-    : document.addEventListener("DOMContentLoaded", resolve);
+  if (document.readyState === "interactive" || document.readyState === "complete" ) {
+    return resolve();
+  }
+  document.addEventListener("readystatechange", function listener() {
+    if (document.readyState === "interactive" || document.readyState === "complete" ) {
+      return;
+    }
+    document.removeEventListener("readystatechange", listener);
+    resolve();
+  });
 });
 
 define(