Merge pull request #56 from webcomponents/check-body

check if <body> exists
webcomponents · Apr 24, 2017 · 81381e8 · 81381e8
2 parents e29fd6d + f85595f
commit 81381e8
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/bower.json b/bower.json
@@ -26,6 +26,6 @@
     "bower_components"
   ],
   "devDependencies": {
-    "web-component-tester": "6.0.0-prerelease.3"
+    "web-component-tester": "^6.0.0-prerelease.3"
   }
 }
diff --git a/html-imports.min.js b/html-imports.min.js
diff --git a/html-imports.min.js.map b/html-imports.min.js.map
diff --git a/package.json b/package.json
@@ -29,9 +29,9 @@
   },
   "homepage": "https://webcomponents.org/polyfills",
   "devDependencies": {
-    "google-closure-compiler": "^20170218.0.0",
+    "google-closure-compiler": "^20170409.0.0",
     "gulp": "^3.8.8",
     "gulp-sourcemaps": "^2.4.0",
-    "web-component-tester": "6.0.0-prerelease.3"
+    "web-component-tester": "^6.0.0-prerelease.3"
   }
 }
diff --git a/src/html-imports.js b/src/html-imports.js
@@ -593,17 +593,16 @@
    * @param {!function()} callback
    */
   const whenDocumentReady = callback => {
-    if (document.readyState !== 'loading') {
-      callback();
-    } else {
-      const stateChanged = () => {
-        if (document.readyState !== 'loading') {
-          document.removeEventListener('readystatechange', stateChanged);
-          callback();
-        }
+    const stateChanged = () => {
+      // NOTE: Firefox can hit readystate interactive without document.body existing.
+      // This is anti-spec, but we handle it here anyways by waiting for next change.
+      if (document.readyState !== 'loading' && !!document.body) {
+        document.removeEventListener('readystatechange', stateChanged);
+        callback();
       }
-      document.addEventListener('readystatechange', stateChanged);
     }
+    document.addEventListener('readystatechange', stateChanged);
+    stateChanged();
   }
 
   /**

diff --git a/tests/index.html b/tests/index.html
@@ -15,6 +15,7 @@
 <script src="../html-imports.min.js"></script>
 <script>
   WCT = {
+    environmentImports: [],
     waitFor: function(callback) {
       this.HTMLImports.whenReady(callback);
     }