fix whenImportsReady

googlearchive · Jan 16, 2014 · ae34005 · ae34005
1 parent d5dc2f6
commit ae34005
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/HTMLImports.js b/src/HTMLImports.js
@@ -222,19 +222,23 @@ function whenImportsReady(callback, doc) {
   var loaded = 0, l = imports.length;
   function check() {
     loaded++;
-    if (loaded == l) {
-      callback && callback();
+    if (loaded == l && callback) {
+      callback();
     }
   }
   for (var i=0, imp; (i<l) && (imp=imports[i]); i++) {
-    if (imp.import) {
+    if (isImportLoaded(imp)) {
       check();
     } else {
       imp.addEventListener('load', check);
     }
   }
 }
 
+function isImportLoaded(link) {
+  return link.import && (useNative || link.import.__importParsed);
+}
+
 // exports
 scope.hasNative = hasNative;
 scope.useNative = useNative;