listen for HTMLImportsLoaded only if HTMLImports.ready is false

googlearchive · Jan 14, 2014 · 51c8369 · 51c8369
1 parent 75798bf
commit 51c8369
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/boot.js b/src/boot.js
@@ -53,7 +53,8 @@ if (document.readyState === 'complete' || scope.flags.eager) {
 // When loading at other readyStates, wait for the appropriate DOM event to 
 // bootstrap.
 } else {
-  var loadEvent = window.HTMLImports ? 'HTMLImportsLoaded' : 'DOMContentLoaded';
+  var loadEvent = window.HTMLImports && !HTMLImports.ready ?
+      'HTMLImportsLoaded' : 'DOMContentLoaded';
   window.addEventListener(loadEvent, bootstrap);
 }