From 44cf5b68119e64f05888374f532a950191c85a27 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Thu, 16 Jul 2015 12:46:00 -0700
Subject: [PATCH 01/10] Fix #351: an element upgrades first via its tag name
 and only secondarily by its is attribute.

---
 src/CustomElements/upgrade.js      | 12 ++++++++----
 tests/CustomElements/js/upgrade.js | 12 ++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/CustomElements/upgrade.js b/src/CustomElements/upgrade.js
index 92a3f95..2d5c93a 100644
--- a/src/CustomElements/upgrade.js
+++ b/src/CustomElements/upgrade.js
@@ -35,11 +35,15 @@ var flags = scope.flags;
 function upgrade(node, isAttached) {
   if (!node.__upgraded__ && (node.nodeType === Node.ELEMENT_NODE)) {
     var is = node.getAttribute('is');
-    var definition = scope.getRegisteredDefinition(is || node.localName);
+    // find definition first by localName and secondarily by is attribute
+    var definition = scope.getRegisteredDefinition(node.localName) ||
+      scope.getRegisteredDefinition(is);
     if (definition) {
-      if (is && definition.tag == node.localName) {
-        return upgradeWithDefinition(node, definition, isAttached);
-      } else if (!is && !definition.extends) {
+      // upgrade with is iff the definition tag matches the element tag
+      // and don't upgrade if there's an is and the definition does not extend
+      // a native element
+      if ((is && definition.tag == node.localName) ||
+        (!is && !definition.extends)) {
         return upgradeWithDefinition(node, definition, isAttached);
       }
     }
diff --git a/tests/CustomElements/js/upgrade.js b/tests/CustomElements/js/upgrade.js
index cbc1a6c..f813fd1 100644
--- a/tests/CustomElements/js/upgrade.js
+++ b/tests/CustomElements/js/upgrade.js
@@ -118,4 +118,16 @@ suite('upgradeElements', function() {
     });
   });
 
+  test('CustomElements.upgrade upgrades element syntax and ignores bogus type extension', function() {
+    var XProto = Object.create(HTMLElement.prototype);
+    XProto.test = 'x-test-value';
+    document.registerElement('x-test', {
+      prototype: XProto
+    });
+    work.innerHTML = '<x-test is="x-foo"></x-test>';
+    CustomElements.upgradeAll(work);
+    var x = work.querySelector('x-test');
+    assert.equal(x.test, 'x-test-value');
+  });
+
 });

From bc382cfc54da393fe86b121dbe816b03a98c9208 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Thu, 23 Jul 2015 19:27:02 -0700
Subject: [PATCH 02/10] Fixes #355 install `innerHTML` on Template elements.

---
 src/Template/Template.js          | 24 ++++++++++++++++++++++++
 tests/Template/html/Template.html | 13 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/Template/Template.js b/src/Template/Template.js
index f8d254c..1f9ed4b 100644
--- a/src/Template/Template.js
+++ b/src/Template/Template.js
@@ -14,6 +14,8 @@ if (typeof HTMLTemplateElement === 'undefined') {
 
     var TEMPLATE_TAG = 'template';
 
+    var contentDoc = document.implementation.createHTMLDocument('template');
+
     /**
       Provides a minimal shim for the <template> element.
     */
@@ -32,6 +34,28 @@ if (typeof HTMLTemplateElement === 'undefined') {
       while (child = template.firstChild) {
         template.content.appendChild(child);
       }
+      // add innerHTML to template
+      Object.defineProperty(template, 'innerHTML', {
+        get: function() {
+          var o = '';
+          for (var e = this.content.firstChild; e; e = e.nextSibling) {
+            if (e) {
+              o += e.outerHTML || e.textContent;
+            }
+          }
+          return o;
+        },
+        set: function(text) {
+          contentDoc.body.innerHTML = text;
+          while (this.content.firstChild) {
+            this.content.removeChild(this.content.firstChild);
+          }
+          while (contentDoc.body.firstChild) {
+            this.content.appendChild(contentDoc.body.firstChild);
+          }
+        },
+        configurable: true
+      });
     };
 
     /**
diff --git a/tests/Template/html/Template.html b/tests/Template/html/Template.html
index 31f5749..e965626 100644
--- a/tests/Template/html/Template.html
+++ b/tests/Template/html/Template.html
@@ -31,6 +31,19 @@
         document.body.appendChild(document.importNode(template.content, true));
         content = document.querySelector('#content');
         chai.assert.isDefined(content, 'template content stamped into document');
+        var imp = document.createElement('template');
+        window.imp = imp;
+        chai.assert.equal(imp.innerHTML, '');
+        var s = 'pre<div>Hi</div><div>Bye</div>post';
+        imp.innerHTML = s;
+        chai.assert.equal(imp.innerHTML, s);
+        chai.assert.equal(imp.content.childNodes.length, 4);
+        chai.assert.equal(imp.content.firstChild.textContent, 'pre');
+        s = 'foo';
+        imp.innerHTML = s;
+        chai.assert.equal(imp.innerHTML, s);
+        chai.assert.equal(imp.content.childNodes.length, 1);
+        chai.assert.equal(imp.content.firstChild.textContent, s);
         done();
       });
     </script>

From c2d7ca1726112868c7d4105233815b8d28806e89 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Thu, 23 Jul 2015 19:39:55 -0700
Subject: [PATCH 03/10] Avoid loading style/link elements with type attribute;
 ensure that load event fired by setting style.textContent (FF only) is
 ignored.

---
 src/HTMLImports/parser.js                           |  8 ++++++--
 tests/HTMLImports/html/imports/sheet4.css           | 13 +++++++++++++
 .../html/imports/style-elements-import.html         |  6 ++++++
 .../html/imports/style-links-import.html            |  2 ++
 tests/HTMLImports/html/style-links.html             |  8 ++++++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/HTMLImports/html/imports/sheet4.css

diff --git a/src/HTMLImports/parser.js b/src/HTMLImports/parser.js
index 83f5b20..f916b57 100644
--- a/src/HTMLImports/parser.js
+++ b/src/HTMLImports/parser.js
@@ -32,8 +32,8 @@ var importParser = {
   // parse selectors for import document elements
   importsSelectors: [
     IMPORT_SELECTOR,
-    'link[rel=stylesheet]',
-    'style',
+    'link[rel=stylesheet]:not([type])',
+    'style:not([type])',
     'script:not([type])',
     'script[type="application/javascript"]',
     'script[type="text/javascript"]'
@@ -178,6 +178,10 @@ var importParser = {
   trackElement: function(elt, callback) {
     var self = this;
     var done = function(e) {
+      // make sure we don't get multiple load/error signals (FF seems to do 
+      // this sometimes when <style> elments change)
+      elt.removeEventListener('load', done);
+      elt.removeEventListener('error', done);
       if (callback) {
         callback(e);
       }
diff --git a/tests/HTMLImports/html/imports/sheet4.css b/tests/HTMLImports/html/imports/sheet4.css
new file mode 100644
index 0000000..acc3a3b
--- /dev/null
+++ b/tests/HTMLImports/html/imports/sheet4.css
@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
+
+.link-typed {
+  background-color: navy;
+}
diff --git a/tests/HTMLImports/html/imports/style-elements-import.html b/tests/HTMLImports/html/imports/style-elements-import.html
index 6e75b7e..e6370f5 100644
--- a/tests/HTMLImports/html/imports/style-elements-import.html
+++ b/tests/HTMLImports/html/imports/style-elements-import.html
@@ -21,4 +21,10 @@
     .styled {
         background: red;
     }
+</style>
+
+<style type="foo">
+    .style-typed {
+        background: red;
+    }
 </style>
\ No newline at end of file
diff --git a/tests/HTMLImports/html/imports/style-links-import.html b/tests/HTMLImports/html/imports/style-links-import.html
index fee70a6..6c1fbfd 100644
--- a/tests/HTMLImports/html/imports/style-links-import.html
+++ b/tests/HTMLImports/html/imports/style-links-import.html
@@ -10,3 +10,5 @@
 <link rel="stylesheet" href="sheet3.css">
 <link rel="stylesheet" href="sheet1.css">
 <link rel="stylesheet" href="sheet2.css">
+
+<link rel="stylesheet" type="foo" href="sheet4.css">
diff --git a/tests/HTMLImports/html/style-links.html b/tests/HTMLImports/html/style-links.html
index fa6906e..b30ff47 100644
--- a/tests/HTMLImports/html/style-links.html
+++ b/tests/HTMLImports/html/style-links.html
@@ -37,6 +37,10 @@
   <div class="styled">red?</div>
   <div class="overridden-style">black?</div>
 
+  <div class="link-typed">red?</div>
+
+  <div class="style-typed">red?</div>
+
 
   <script>
     addEventListener('HTMLImportsLoaded', function() {
@@ -59,6 +63,10 @@
         chai.assert.equal(computedStyle('.styled').backgroundColor, 'rgb(255, 0, 0)');
         // styles in style are applied in the correct order and overriddable
         chai.assert.equal(computedStyle('.overridden-style').backgroundColor, 'rgb(0, 0, 0)');
+        // links with type attr are not imported
+        chai.assert.equal(computedStyle('.link-typed').backgroundColor, 'rgba(0, 0, 0, 0)');
+        // styles with type attr are not imported
+        chai.assert.equal(computedStyle('.style-typed').backgroundColor, 'rgba(0, 0, 0, 0)');
 
 
         done();

From 1e17c4c434db761db2ddea523d299f83ebbd8479 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Thu, 23 Jul 2015 19:46:17 -0700
Subject: [PATCH 04/10] Fixes #354: remove unnecessary legacy Polymer code from
 polyfills.

---
 src/WebComponents/dom.js | 46 ----------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/src/WebComponents/dom.js b/src/WebComponents/dom.js
index de26c5e..933710c 100644
--- a/src/WebComponents/dom.js
+++ b/src/WebComponents/dom.js
@@ -49,50 +49,4 @@
     })();
   }
 
-  // Make a stub for Polymer() for polyfill purposes; under the HTMLImports
-  // polyfill, scripts in the main document run before imports. That means
-  // if (1) polymer is imported and (2) Polymer() is called in the main document
-  // in a script after the import, 2 occurs before 1. We correct this here
-  // by specfiically patching Polymer(); this is not necessary under native
-  // HTMLImports.
-  var elementDeclarations = [];
-
-  var polymerStub = function(name, dictionary) {
-    if ((typeof name !== 'string') && (arguments.length === 1)) {
-      Array.prototype.push.call(arguments, document._currentScript);
-    }
-    elementDeclarations.push(arguments);
-  };
-  window.Polymer = polymerStub;
-
-  // deliver queued delcarations
-  scope.consumeDeclarations = function(callback) {
-    scope.consumeDeclarations = function() {
-     throw 'Possible attempt to load Polymer twice';
-    };
-    if (callback) {
-      callback(elementDeclarations);
-    }
-    elementDeclarations = null;
-  };
-
-  function installPolymerWarning() {
-    if (window.Polymer === polymerStub) {
-      window.Polymer = function() {
-        throw new Error('You tried to use polymer without loading it first. To ' +
-          'load polymer, <link rel="import" href="' +
-          'components/polymer/polymer.html">');
-      };
-    }
-  }
-
-  // Once DOMContent has loaded, any main document scripts that depend on
-  // Polymer() should have run. Calling Polymer() now is an error until
-  // polymer is imported.
-  if (HTMLImports.useNative) {
-    installPolymerWarning();
-  } else {
-    window.addEventListener('DOMContentLoaded', installPolymerWarning);
-  }
-
 })(window.WebComponents);

From d68933dd6df048b594f060ee242a6521a1579319 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Fri, 24 Jul 2015 11:00:03 -0700
Subject: [PATCH 05/10] Add proper text escaping to innerHTML getter.

---
 src/Template/Template.js          | 25 ++++++++++++++++++++++---
 tests/Template/html/Template.html |  7 +++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/Template/Template.js b/src/Template/Template.js
index 1f9ed4b..4f69f84 100644
--- a/src/Template/Template.js
+++ b/src/Template/Template.js
@@ -39,9 +39,7 @@ if (typeof HTMLTemplateElement === 'undefined') {
         get: function() {
           var o = '';
           for (var e = this.content.firstChild; e; e = e.nextSibling) {
-            if (e) {
-              o += e.outerHTML || e.textContent;
-            }
+            o += e.outerHTML || escapeData(e.data);
           }
           return o;
         },
@@ -85,5 +83,26 @@ if (typeof HTMLTemplateElement === 'undefined') {
       return el;
     };
 
+    var escapeDataRegExp = /[&\u00A0<>]/g;
+
+    function escapeReplace(c) {
+      switch (c) {
+        case '&':
+          return '&amp;';
+        case '<':
+          return '&lt;';
+        case '>':
+          return '&gt;';
+        case '"':
+          return '&quot;'
+        case '\u00A0':
+          return '&nbsp;';
+      }
+    }
+
+    function escapeData(s) {
+      return s.replace(escapeDataRegExp, escapeReplace);
+    }
+
   })();
 }
diff --git a/tests/Template/html/Template.html b/tests/Template/html/Template.html
index e965626..7c38a08 100644
--- a/tests/Template/html/Template.html
+++ b/tests/Template/html/Template.html
@@ -44,6 +44,13 @@
         chai.assert.equal(imp.innerHTML, s);
         chai.assert.equal(imp.content.childNodes.length, 1);
         chai.assert.equal(imp.content.firstChild.textContent, s);
+
+        s = '-<->-"-&-';
+        var escaped = '-&lt;-&gt;-"-&amp;-';
+        imp.innerHTML = s;
+        // innerHTML is properly escaped
+        chai.assert.equal(imp.innerHTML, escaped);
+        chai.assert.equal(imp.content.childNodes.length, 1);
         done();
       });
     </script>

From 925f78379d43943d42be1aaab1033e2af7723712 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Fri, 24 Jul 2015 15:52:11 -0700
Subject: [PATCH 06/10] Fixes #357: Upgrade imports eagerly when parsed; make
 .import reference available only after parsed.

---
 src/CustomElements/boot.js                    | 15 ++++---
 src/CustomElements/observe.js                 |  1 +
 src/HTMLImports/importer.js                   |  2 +-
 src/HTMLImports/parser.js                     |  8 ++--
 tests/WebComponents/html/a1-define.html       | 32 ++++++++++++++
 tests/WebComponents/html/a1-import.html       | 11 +++++
 tests/WebComponents/html/a1-instance.html     | 12 +++++
 tests/WebComponents/html/a1-reference.html    | 18 ++++++++
 .../html/ce-import-upgrade-async.html         | 44 +++++++++++++++++++
 .../WebComponents/html/ce-import-upgrade.html | 39 ++++++++++++++++
 tests/WebComponents/tests.js                  |  2 +
 11 files changed, 171 insertions(+), 13 deletions(-)
 create mode 100644 tests/WebComponents/html/a1-define.html
 create mode 100644 tests/WebComponents/html/a1-import.html
 create mode 100644 tests/WebComponents/html/a1-instance.html
 create mode 100644 tests/WebComponents/html/a1-reference.html
 create mode 100644 tests/WebComponents/html/ce-import-upgrade-async.html
 create mode 100644 tests/WebComponents/html/ce-import-upgrade.html

diff --git a/src/CustomElements/boot.js b/src/CustomElements/boot.js
index 46843dc..2113978 100644
--- a/src/CustomElements/boot.js
+++ b/src/CustomElements/boot.js
@@ -43,6 +43,7 @@ if (useNative) {
 
 // imports
 var upgradeDocumentTree = scope.upgradeDocumentTree;
+var upgradeDocument = scope.upgradeDocument;
 
 // ShadowDOM polyfill wraps elements but some elements like `document`
 // cannot be wrapped so we help the polyfill by wrapping some elements.
@@ -57,18 +58,18 @@ if (!window.wrap) {
   }
 }
 
+// eagarly upgrade imported documents
+if (window.HTMLImports) {
+  window.HTMLImports.__importsParsingHook = function(elt) {
+    upgradeDocument(wrap(elt.import));
+  };
+}
 
 // bootstrap parsing
 function bootstrap() {
-  // parse document
+  // one more upgrade to catch out of order registrations
   upgradeDocumentTree(window.wrap(document));
   // install upgrade hook if HTMLImports are available
-  if (window.HTMLImports) {
-    window.HTMLImports.__importsParsingHook = function(elt) {
-      upgradeDocumentTree(window.wrap(elt.import));
-      //CustomElements.parser.parse(elt.import);
-    };
-  }
   // set internal 'ready' flag, now document.registerElement will trigger
   // synchronous upgrades
   window.CustomElements.ready = true;
diff --git a/src/CustomElements/observe.js b/src/CustomElements/observe.js
index 2a9d605..d34ddcf 100644
--- a/src/CustomElements/observe.js
+++ b/src/CustomElements/observe.js
@@ -300,6 +300,7 @@ if (originalCreateShadowRoot) {
 // exports
 scope.watchShadow = watchShadow;
 scope.upgradeDocumentTree = upgradeDocumentTree;
+scope.upgradeDocument = upgradeDocument;
 scope.upgradeSubtree = addedSubtree;
 scope.upgradeAll = addedNode;
 scope.attached = attached;
diff --git a/src/HTMLImports/importer.js b/src/HTMLImports/importer.js
index 6ae8a93..81bd703 100644
--- a/src/HTMLImports/importer.js
+++ b/src/HTMLImports/importer.js
@@ -84,7 +84,7 @@ var importer = {
       }
       // don't store import record until we're actually loaded
       // store document resource
-      elt.import = doc;
+      elt.__doc = doc;
     }
     parser.parseNext();
   },
diff --git a/src/HTMLImports/parser.js b/src/HTMLImports/parser.js
index f916b57..033b68f 100644
--- a/src/HTMLImports/parser.js
+++ b/src/HTMLImports/parser.js
@@ -107,9 +107,7 @@ var importParser = {
   },
 
   parseImport: function(elt) {
-    // TODO(sorvell): consider if there's a better way to do this;
-    // expose an imports parsing hook; this is needed, for example, by the
-    // CustomElements polyfill.
+    elt.import = elt.__doc;
     if (window.HTMLImports.__importsParsingHook) {
       window.HTMLImports.__importsParsingHook(elt);
     }
@@ -260,7 +258,7 @@ var importParser = {
       for (var i=0, l=nodes.length, p=0, n; (i<l) && (n=nodes[i]); i++) {
         if (!this.isParsed(n)) {
           if (this.hasResource(n)) {
-            return nodeIsImport(n) ? this.nextToParseInDoc(n.import, n) : n;
+            return nodeIsImport(n) ? this.nextToParseInDoc(n.__doc, n) : n;
           } else {
             return;
           }
@@ -292,7 +290,7 @@ var importParser = {
   },
 
   hasResource: function(node) {
-    if (nodeIsImport(node) && (node.import === undefined)) {
+    if (nodeIsImport(node) && (node.__doc === undefined)) {
       return false;
     }
     return true;
diff --git a/tests/WebComponents/html/a1-define.html b/tests/WebComponents/html/a1-define.html
new file mode 100644
index 0000000..3242690
--- /dev/null
+++ b/tests/WebComponents/html/a1-define.html
@@ -0,0 +1,32 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<script>
+(function() {
+
+  window.a1DocsList = [];
+
+  var p = Object.create(HTMLElement.prototype);
+
+  p.createdCallback = function() {
+    a1DocsList.push(this.ownerDocument.baseURI.split('/').pop());
+    this.isA1 = true;
+  }
+
+  document.registerElement('a-1', {prototype: p});
+
+  var p2 = Object.create(HTMLStyleElement.prototype);
+  p2.createdCallback = function() {
+    window.styleAppliedToDocument = Boolean(this.__appliedElement);
+  }
+
+  document.registerElement('special-style', {prototype: p2, extends: 'style'});
+
+})();
+</script>
\ No newline at end of file
diff --git a/tests/WebComponents/html/a1-import.html b/tests/WebComponents/html/a1-import.html
new file mode 100644
index 0000000..eefee81
--- /dev/null
+++ b/tests/WebComponents/html/a1-import.html
@@ -0,0 +1,11 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<link rel="import" href="a1-define.html">
+<link rel="import" href="a1-reference.html">
\ No newline at end of file
diff --git a/tests/WebComponents/html/a1-instance.html b/tests/WebComponents/html/a1-instance.html
new file mode 100644
index 0000000..c54f7ed
--- /dev/null
+++ b/tests/WebComponents/html/a1-instance.html
@@ -0,0 +1,12 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<a-1></a-1>
+
+<style is="special-style"></style>
\ No newline at end of file
diff --git a/tests/WebComponents/html/a1-reference.html b/tests/WebComponents/html/a1-reference.html
new file mode 100644
index 0000000..28d7cf5
--- /dev/null
+++ b/tests/WebComponents/html/a1-reference.html
@@ -0,0 +1,18 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<link rel="import" href="a1-instance.html">
+<a-1></a-1>
+<script>
+  // can reference upgraded instance in previous import when this script runs
+  var l = document._currentScript.ownerDocument.querySelector('link');
+  var a1 = l.import.querySelector('a-1');
+  window.a1 = a1;
+  window.isA1Upgraded = a1.isA1;
+</script>
\ No newline at end of file
diff --git a/tests/WebComponents/html/ce-import-upgrade-async.html b/tests/WebComponents/html/ce-import-upgrade-async.html
new file mode 100644
index 0000000..7384f4d
--- /dev/null
+++ b/tests/WebComponents/html/ce-import-upgrade-async.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+  <head>
+    <title></title>
+    <meta charset="UTF-8">
+    <script src="../../tools/chai/chai.js"></script>
+    <script src="../../tools/htmltest.js"></script>
+    <script src="../../../webcomponents-lite.js"></script>
+  </head>
+  <body>
+    <script>
+      var assert = chai.assert;
+
+      function testImports() {
+        // import upgraded
+        assert.ok(a1);
+        assert.isTrue(isA1Upgraded);
+        // order expected
+        assert.deepEqual(a1DocsList, ['a1-instance.html', 'a1-reference.html']);
+        // style applied at upgrade time
+        assert.isTrue(styleAppliedToDocument);
+        done();
+      }
+
+      // be async
+      setTimeout(function() {
+        var l = document.createElement('link');
+        l.rel = 'import';
+        l.href = 'a1-import.html';
+        l.addEventListener('load', testImports);
+        document.head.appendChild(l);
+      });      
+    </script>
+  </body>
+</html>
diff --git a/tests/WebComponents/html/ce-import-upgrade.html b/tests/WebComponents/html/ce-import-upgrade.html
new file mode 100644
index 0000000..13c48d0
--- /dev/null
+++ b/tests/WebComponents/html/ce-import-upgrade.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+  <head>
+    <title></title>
+    <meta charset="UTF-8">
+    <script src="../../tools/chai/chai.js"></script>
+    <script src="../../tools/htmltest.js"></script>
+    <script src="../../../webcomponents-lite.js"></script>
+    <link rel="import" href="a1-import.html">
+  </head>
+  <body>
+    <script>
+      var assert = chai.assert;
+
+      function testImports() {
+        // import upgraded
+        assert.ok(a1);
+        assert.isTrue(isA1Upgraded);
+        // order expected
+        assert.deepEqual(a1DocsList, ['a1-instance.html', 'a1-reference.html']);
+        // style applied at upgrade time
+        assert.isTrue(styleAppliedToDocument);
+        done();
+      }
+
+      addEventListener('WebComponentsReady', testImports);
+
+    </script>
+  </body>
+</html>
diff --git a/tests/WebComponents/tests.js b/tests/WebComponents/tests.js
index cbdd85c..e6ff528 100644
--- a/tests/WebComponents/tests.js
+++ b/tests/WebComponents/tests.js
@@ -22,6 +22,8 @@ htmlSuite('integration', function() {
   htmlTest('html/ce-upgradedocumenttree.html');
   htmlTest('html/ce-import.html?wc-shadow');
   htmlTest('html/ce-upgrade-order.html');
+  htmlTest('html/ce-import-upgrade.html');
+  htmlTest('html/ce-import-upgrade-async.html');
 });
 
 htmlSuite('Library Cooperation', function() {

From 718074cb7d1807fc111d17718584a22a8fb2fd4b Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Fri, 24 Jul 2015 15:55:23 -0700
Subject: [PATCH 07/10] Removed escaping for quotes since it's not used in this
 case.

---
 src/Template/Template.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Template/Template.js b/src/Template/Template.js
index 4f69f84..f2c33c1 100644
--- a/src/Template/Template.js
+++ b/src/Template/Template.js
@@ -93,8 +93,6 @@ if (typeof HTMLTemplateElement === 'undefined') {
           return '&lt;';
         case '>':
           return '&gt;';
-        case '"':
-          return '&quot;'
         case '\u00A0':
           return '&nbsp;';
       }

From 8289c09323b2fd2aa9e827c1eb34db96d047977e Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Wed, 29 Jul 2015 19:47:24 -0700
Subject: [PATCH 08/10] CE polyfill only upgrades imports if document loaded.

---
 src/CustomElements/boot.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/CustomElements/boot.js b/src/CustomElements/boot.js
index 2113978..e0eabce 100644
--- a/src/CustomElements/boot.js
+++ b/src/CustomElements/boot.js
@@ -61,7 +61,9 @@ if (!window.wrap) {
 // eagarly upgrade imported documents
 if (window.HTMLImports) {
   window.HTMLImports.__importsParsingHook = function(elt) {
-    upgradeDocument(wrap(elt.import));
+    if (elt.import) {
+      upgradeDocument(wrap(elt.import));
+    }
   };
 }
 

From 40d02d6bd4e94650b204beb7dd5cf0ff80ca695e Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@google.com>
Date: Fri, 31 Jul 2015 15:55:55 -0700
Subject: [PATCH 09/10] Don't fake a load event for styles on Edge

Fixes https://github.com/webcomponents/webcomponentsjs/issues/366
---
 src/HTMLImports/parser.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/HTMLImports/parser.js b/src/HTMLImports/parser.js
index 033b68f..38969a0 100644
--- a/src/HTMLImports/parser.js
+++ b/src/HTMLImports/parser.js
@@ -13,7 +13,7 @@ window.HTMLImports.addModule(function(scope) {
 var path = scope.path;
 var rootDocument = scope.rootDocument;
 var flags = scope.flags;
-var isIE = scope.isIE;
+var isIE11OrOlder = scope.isIE11OrOlder;
 var IMPORT_LINK_TYPE = scope.IMPORT_LINK_TYPE;
 var IMPORT_SELECTOR = 'link[rel=' + IMPORT_LINK_TYPE + ']';
 
@@ -176,7 +176,7 @@ var importParser = {
   trackElement: function(elt, callback) {
     var self = this;
     var done = function(e) {
-      // make sure we don't get multiple load/error signals (FF seems to do 
+      // make sure we don't get multiple load/error signals (FF seems to do
       // this sometimes when <style> elments change)
       elt.removeEventListener('load', done);
       elt.removeEventListener('error', done);
@@ -191,7 +191,7 @@ var importParser = {
 
     // NOTE: IE does not fire "load" event for styles that have already loaded
     // This is in violation of the spec, so we try our hardest to work around it
-    if (isIE && elt.localName === 'style') {
+    if (isIE11OrOlder && elt.localName === 'style') {
       var fakeLoad = false;
       // If there's not @import in the textContent, assume it has loaded
       if (elt.textContent.indexOf('@import') == -1) {

From 74f8cc0ec94fada90fd70be0771f4fbb8957fd47 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Mon, 3 Aug 2015 15:42:27 -0700
Subject: [PATCH 10/10] prepare for release v0.7.8

---
 bower.json   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 9856d3a..5ca8d66 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "webcomponentsjs",
   "main": "webcomponents.js",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "homepage": "http://webcomponents.org",
   "authors": [
     "The Polymer Authors"
diff --git a/package.json b/package.json
index f49674b..04ac7f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webcomponents.js",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "webcomponents.js",
   "main": "webcomponents.js",
   "directories": {