fire error event on xhr error.

googlearchive · Aug 5, 2014 · fa005c1 · fa005c1
1 parent ad5cfb2
commit fa005c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/HTMLImports.js b/src/HTMLImports.js
@@ -54,12 +54,13 @@ if (!useNative) {
       return doc === mainDoc ? this.documentPreloadSelectors :
           this.importsPreloadSelectors;
     },
-    loaded: function(url, elt, resource) {
+    loaded: function(url, elt, resource, err) {
       flags.load && console.log('loaded', url, elt);
       // store generic resource
       // TODO(sorvell): fails for nodes inside <template>.content
       // see https://code.google.com/p/chromium/issues/detail?id=249381.
       elt.__resource = resource;
+      elt.__error = err;
       if (isDocumentLink(elt)) {
         var doc = this.documents[url];
         // if we've never seen a document at this url

diff --git a/src/Loader.js b/src/Loader.js
@@ -120,7 +120,7 @@
         //if (!err) {
           // If url was redirected, use the redirected location so paths are
           // calculated relative to that.
-          this.onload(redirectedUrl || url, p, resource);
+          this.onload(redirectedUrl || url, p, resource, err);
         //}
         this.tail();
       }

diff --git a/src/Parser.js b/src/Parser.js
@@ -100,7 +100,7 @@ var importParser = {
     elt.import.__importParsed = true;
     this.markParsingComplete(elt);
     // fire load event
-    if (elt.__resource) {
+    if (elt.__resource && !elt.__error) {
       elt.dispatchEvent(new CustomEvent('load', {bubbles: false}));    
     } else {
       elt.dispatchEvent(new CustomEvent('error', {bubbles: false}));