manage import load tracking more carefully

googlearchive · Jan 21, 2014 · 3f4ca5c · 3f4ca5c
1 parent 6522703
commit 3f4ca5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/HTMLImports.js b/src/HTMLImports.js
@@ -124,7 +124,7 @@ if (!useNative) {
         }
         // don't store import record until we're actually loaded
         // store document resource
-        elt.content = resource = document;
+        elt.import = elt.content = resource = document;
       }
       // store generic resource
       // TODO(sorvell): fails for nodes inside <template>.content
@@ -213,7 +213,7 @@ function whenImportsReady(callback, doc) {
   }
   var imports = doc.querySelectorAll('link[rel=import');
   var loaded = 0, l = imports.length;
-  function checkDone(d) {  
+  function checkDone(d) { 
     if (loaded == l) {
       // go async to ensure parser isn't stuck on a script tag
       requestAnimationFrame(callback);
@@ -230,6 +230,7 @@ function whenImportsReady(callback, doc) {
         loadedImport.call(imp);
       } else {
         imp.addEventListener('load', loadedImport);
+        imp.addEventListener('error', loadedImport);
       }
     }
   } else {
@@ -238,7 +239,8 @@ function whenImportsReady(callback, doc) {
 }
 
 function isImportLoaded(link) {
-  return link.import && (link.import.readyState !== 'loading');
+  return useNative ? (link.import && (link.import.readyState !== 'loading')) :
+      link.__importParsed;
 }
 
 // exports

diff --git a/src/Parser.js b/src/Parser.js
@@ -10,6 +10,7 @@ var path = scope.path;
 
 var IMPORT_LINK_TYPE = 'import';
 var isIe = /Trident/.test(navigator.userAgent)
+
 // highlander object for parsing a document tree
 
 var importParser = {
@@ -63,14 +64,13 @@ var importParser = {
       this.trackElement(linkElt);
       if (linkElt.__resource) {
         importParser.parse(linkElt.__resource, function() {
-          // import is now ready so make available
-          linkElt.import = linkElt.__resource;
           // fire load event
           linkElt.dispatchEvent(new CustomEvent('load', {bubbles: false}));
         });
       } else {
         linkElt.dispatchEvent(new CustomEvent('error', {bubbles: false}));
       }
+      linkElt.__importParsed = true;
     } else {
       // make href relative to main document
       if (needsMainDocumentContext(linkElt)) {