From 79fec83e9cfd0cde8b38cf54a0eca0e60acf2fc3 Mon Sep 17 00:00:00 2001 From: Steve Orvell Date: Thu, 14 Nov 2013 16:17:52 -0800 Subject: [PATCH] Update to follow current spec: (1) make imported document available via link.import, (2) fire load event when import is loaded. --- src/HTMLImports.js | 8 +++----- src/Parser.js | 6 ++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/HTMLImports.js b/src/HTMLImports.js index 7e904ff..42c2b93 100644 --- a/src/HTMLImports.js +++ b/src/HTMLImports.js @@ -115,11 +115,9 @@ var importer = { importer.preload(document); } // store import record - elt.import = { - href: url, - ownerNode: elt, - content: document - }; + elt.import = document; + elt.import.href = url; + elt.import.ownerNode = elt; // store document resource elt.content = resource = document; } diff --git a/src/Parser.js b/src/Parser.js index 93c9c8c..b58ba2a 100644 --- a/src/Parser.js +++ b/src/Parser.js @@ -48,8 +48,10 @@ var importParser = { }, parseLink: function(linkElt) { if (isDocumentLink(linkElt)) { - if (linkElt.content) { - importParser.parse(linkElt.content); + if (linkElt.import) { + importParser.parse(linkElt.import); + // fire load event + linkElt.dispatchEvent(new CustomEvent('load')); } } else { this.parseGeneric(linkElt);