From 100733ca1024be01e05d081ec9476d114e0cc5ff Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Thu, 1 Aug 2013 19:02:44 -0700
Subject: [PATCH 01/19] adapt to mdv's removal of createBinding; override bind
 instead.

---
 src/instance/mdv.js          | 6 +++---
 test/html/attr-mustache.html | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/instance/mdv.js b/src/instance/mdv.js
index f206e32f46..59f42e0d58 100644
--- a/src/instance/mdv.js
+++ b/src/instance/mdv.js
@@ -19,15 +19,15 @@
     instanceTemplate: function(template) {
       return template.createInstance(this, mdv_syntax);
     },
-    createBinding: function(name, model, path) {
-      //console.log(arguments);
+    bind: function(name, model, path) {
       var property = this.propertyForAttribute(name);
       if (property) {
+        this.unbind(name);
         // use n-way Polymer binding
         var observer = this.bindProperty(property, model, path);
         // stick path on observer so it's available via this.bindings
         observer.path = path;
-        return observer;
+        return this.bindings[name] = observer;
       } else {
         return this.super(arguments);
       }
diff --git a/test/html/attr-mustache.html b/test/html/attr-mustache.html
index 7b7b431be0..fd3aa8ad86 100644
--- a/test/html/attr-mustache.html
+++ b/test/html/attr-mustache.html
@@ -13,8 +13,8 @@
       <script>
         Polymer('x-target', {
           // force an mdv binding
-          createBinding: function() {
-            return Element.prototype.createBinding.apply(this, arguments);
+          bind: function() {
+            return Element.prototype.bind.apply(this, arguments);
           },
           inserted: function() {
             this.testSrcForMustache();

From a3aeb2f3e9cf875f6b4544c78cfabcd160003e77 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Fri, 2 Aug 2013 00:44:07 -0700
Subject: [PATCH 02/19] defer document.register until custom extendee is
 registered

---
 src/declaration/polymer-element.js | 73 ++++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 5c827c082e..74260fe053 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -10,21 +10,44 @@
   var extend = Polymer.extend;
   var apis = scope.api.declaration;
 
-  var deferred = {};
-
   // imperative implementation: Polymer()
   
   // maps tag names to prototypes
   var registry = {};
 
-  // register an 'own' prototype for tag `name`
+  function getRegisteredPrototype(name) {
+    return registry[name];
+  }
+
+  // elements waiting for prototype, by name
+  var waitPrototype = {};
+
+  // specify an 'own' prototype for tag `name`
   function element(name, prototype) {
+    // cache the prototype
     registry[name] = prototype || {};
-    if (deferred[name]) {
-      deferred[name].define();
+    // notify the registrar waiting for 'name', if any
+    notifyPrototype(name);
+  }
+
+  function notifyPrototype(name) {
+    if (waitPrototype[name]) {
+      waitPrototype[name].define();
     }
   }
-  
+
+  // elements waiting for super, by name
+  var waitSuper = {};
+
+  function notifySuper(name) {
+    var waiting = waitSuper[name];
+    if (waiting) {
+      waiting.forEach(function(w) {
+        w.define();
+      });
+    }
+  }
+
   // returns a prototype that chains to <tag> or HTMLElement
   function generatePrototype(tag) {
     return Object.create(HTMLElement.getPrototypeForTag(tag));
@@ -33,7 +56,7 @@
   // On platforms that do not support __proto__ (IE10), the prototype chain
   // of a custom element is simulated via installation of __proto__.
   // Although custom elements manages this, we install it here so it's 
-  // available during desuaring.
+  // available during desugaring.
   function ensurePrototypeTraversal(prototype) {
     if (!Object.__proto__) {
       var ancestor = Object.getPrototypeOf(prototype);
@@ -44,9 +67,10 @@
     }
   }
 
-  // declarative implementation: <polymer-element> 
- 
+  // declarative implementation: <polymer-element>
+
   var prototype = generatePrototype();
+
   extend(prototype, {
     // TODO(sjmiles): temporary BC
     readyCallback: function() {
@@ -58,21 +82,30 @@
     // custom element processing
     _createdCallback: function() {
       // fetch our element name
-      var name = this.getAttribute('name');
-      if (registry[name]) {
+      this.name = this.getAttribute('name');
+      if (getRegisteredPrototype(this.name)) {
         this.define();
       } else {
-        deferred[name] = this;
+        waitPrototype[this.name] = this;
       }
     },
     define: function() {
-      // fetch our element name
-      var name = this.getAttribute('name');
       // fetch our extendee name
       var extnds = this.getAttribute('extends');
+      // if extending a custom element...
+      if (extnds && extnds.indexOf('-') >= 0) {
+        // wait for the extendee to be registered first
+        if (!getRegisteredPrototype(extnds)) {
+          (waitSuper[extnds] = (waitSuper[extnds] || [])).push(this);
+          return;
+        }
+      }
+      this.register(this.name, extnds);
+    },
+    register: function(name, extnds) {
       // build prototype combining extendee, Polymer base, and named api
       this.prototype = this.generateCustomPrototype(name, extnds);
-      // questionable backref
+      // backref
       this.prototype.element = this;
       // TODO(sorvell): install a helper method this.resolvePath to aid in 
       // setting resource paths. e.g. 
@@ -88,9 +121,11 @@
         Platform.ShadowCSS.shimStyling(this.templateContent(), name, extnds);
       }
       // register our custom element
-      this.register(name);
-      // reference constructor in a global named by 'constructor' attribute    
+      this.registerPrototype(name);
+      // reference constructor in a global named by 'constructor' attribute
       this.publishConstructor();
+      // subclasses may now register themselves
+      notifySuper(name);
     },
     // implement various declarative features
     desugar: function(prototype) {
@@ -142,7 +177,7 @@
     // mix api registered to 'name' into 'prototype' 
     addNamedApi: function(prototype, name) { 
       // combine custom api into prototype
-      return extend(prototype, registry[name]);
+      return extend(prototype, getRegisteredPrototype(name));
     },
     // make a fresh object that inherits from a prototype object
     inheritObject: function(prototype, name) {
@@ -150,7 +185,7 @@
       prototype[name] = extend({}, Object.getPrototypeOf(prototype)[name]);
     },
     // register 'prototype' to custom element 'name', store constructor 
-    register: function(name) { 
+    registerPrototype: function(name) { 
       // register the custom type
       this.ctor = document.register(name, {
         prototype: this.prototype

From 85e479965a87044ebaf360cef328141a7069cf78 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Fri, 2 Aug 2013 00:46:43 -0700
Subject: [PATCH 03/19] first tests for class registration order

---
 test/html/element-registration.html | 51 +++++++++++++++++++++++++++++
 test/js/register.js                 |  4 +++
 2 files changed, 55 insertions(+)
 create mode 100644 test/html/element-registration.html

diff --git a/test/html/element-registration.html b/test/html/element-registration.html
new file mode 100644
index 0000000000..c17d0c68f8
--- /dev/null
+++ b/test/html/element-registration.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<html>
+<head>
+  <title>element script</title>
+  <script src="../../polymer.js"></script>
+  <script src="../../tools/test/htmltest.js"></script>
+  <script src="../../tools/test/chai/chai.js"></script>
+</head>
+<body>
+  <x-foo></x-foo>
+  <hr>
+  
+  <x-bar></x-bar>
+  <hr>
+  
+  <polymer-element name="x-foo">
+    <template>
+      Hello Light World
+    </template>
+  </polymer-element>
+  
+  <polymer-element name="x-bar" extends="x-foo">
+    <template>
+      Hello Lighter World [<shadow></shadow>]
+    </template>
+    <script>
+      Polymer('x-bar', {});
+    </script>
+  </polymer-element>
+
+  <script>
+    Polymer('x-foo', {
+      ready: function() {
+        this.squid = 'ink';
+      }
+    });
+  </script>
+
+  <script>
+    var assert = chai.assert;
+    document.addEventListener('WebComponentsReady', function() {
+      var foo = document.querySelector('x-foo');
+      assert.equal(foo.squid, 'ink');
+      var bar = document.querySelector('x-bar');
+      assert.equal(bar.squid, 'ink');
+      done();
+    });
+  </script>
+  
+</body>
+</html>
\ No newline at end of file
diff --git a/test/js/register.js b/test/js/register.js
index 4ff02de121..274e04dfed 100644
--- a/test/js/register.js
+++ b/test/js/register.js
@@ -49,3 +49,7 @@ htmlSuite('element callbacks', function() {
 htmlSuite('element script', function() {
   htmlTest('html/element-script.html');
 });
+
+htmlSuite('element registration', function() {
+  htmlTest('html/element-registration.html');
+});

From 244a0040b0b0d0e170d37043ea23f9ab10c35e71 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Fri, 2 Aug 2013 00:47:05 -0700
Subject: [PATCH 04/19] towards using mocha/chai from tools

---
 test/html/callbacks.html | 2 +-
 tools                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/html/callbacks.html b/test/html/callbacks.html
index e4bcba05be..ed6e0ad07a 100644
--- a/test/html/callbacks.html
+++ b/test/html/callbacks.html
@@ -4,7 +4,7 @@
     <title>event path</title>
     <script src="../../polymer.js"></script>
     <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/tools b/tools
index 5d50474984..313f7524ce 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 5d504749846cc8df777ab6c493d7169ddfc8d638
+Subproject commit 313f7524ce37689ebfb60c81f7bda721535467cf

From f72698d3fdfbc6d17845f7dba17fab1aa3e9e634 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Fri, 2 Aug 2013 01:44:03 -0700
Subject: [PATCH 05/19] inoculate element registration to the effects of load
 order

---
 src/declaration/polymer-element.js  |  40 ++++++----
 test/html/element-registration.html | 116 ++++++++++++++++++++++++++--
 test/js/register.js                 |   4 +-
 3 files changed, 138 insertions(+), 22 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 74260fe053..40dd8e75e6 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -32,7 +32,7 @@
 
   function notifyPrototype(name) {
     if (waitPrototype[name]) {
-      waitPrototype[name].define();
+      waitPrototype[name].registerWhenReady();
     }
   }
 
@@ -43,7 +43,7 @@
     var waiting = waitSuper[name];
     if (waiting) {
       waiting.forEach(function(w) {
-        w.define();
+        w.registerWhenReady();
       });
     }
   }
@@ -74,22 +74,32 @@
   extend(prototype, {
     // TODO(sjmiles): temporary BC
     readyCallback: function() {
-      this._createdCallback();
+      this.createdCallback();
     },
     createdCallback: function() {
-      this._createdCallback();
-    },
-    // custom element processing
-    _createdCallback: function() {
-      // fetch our element name
+      // fetch the element name
       this.name = this.getAttribute('name');
-      if (getRegisteredPrototype(this.name)) {
-        this.define();
-      } else {
-        waitPrototype[this.name] = this;
-      }
+      // install element definition, if ready
+      this.registerWhenReady();
     },
-    define: function() {
+    registerWhenReady: function() {
+      var name = this.name;
+      // if we have no prototype
+      if (!getRegisteredPrototype(name)) {
+        // then wait for a prototype
+        waitPrototype[name] = this;
+        // if we are not explicitly async,
+        // then wait for end of microtask(-ish)
+        // and use whatever prototype is available
+        if (!this.hasAttribute('async')) {
+          setTimeout(function() {
+            if (!getRegisteredPrototype(name)) {
+              element(name, null);
+            }
+          }, 0);
+        }
+        return;
+      }
       // fetch our extendee name
       var extnds = this.getAttribute('extends');
       // if extending a custom element...
@@ -100,7 +110,7 @@
           return;
         }
       }
-      this.register(this.name, extnds);
+      this.register(name, extnds);
     },
     register: function(name, extnds) {
       // build prototype combining extendee, Polymer base, and named api
diff --git a/test/html/element-registration.html b/test/html/element-registration.html
index c17d0c68f8..bbf415b9f2 100644
--- a/test/html/element-registration.html
+++ b/test/html/element-registration.html
@@ -9,16 +9,37 @@
 <body>
   <x-foo></x-foo>
   <hr>
-  
+
   <x-bar></x-bar>
   <hr>
-  
+
+  <x-zot></x-zot>
+  <hr>
+
+  <x-zap></x-zap>
+  <hr>
+
+  <x-fizz></x-fizz>
+  <hr>
+
+  <x-zzif></x-zzif>
+  <hr>
+
+  <x-quux></x-quux>
+  <hr>
+
+  <x-blarg></x-blarg>
+  <hr>
+
+  <!-- script follows declaration -->
   <polymer-element name="x-foo">
     <template>
       Hello Light World
     </template>
   </polymer-element>
-  
+
+  <!-- script embedded in declaration -->
+  <!-- super script follows declaration -->
   <polymer-element name="x-bar" extends="x-foo">
     <template>
       Hello Lighter World [<shadow></shadow>]
@@ -28,6 +49,15 @@
     </script>
   </polymer-element>
 
+  <!-- no script extends w/script -->
+  <!-- super script follows declaration -->
+  <polymer-element name="x-quux" extends="x-foo">
+    <template>
+      Quux's Shadow Content [<shadow></shadow>]
+    </template>
+  </polymer-element>
+
+  <!-- script following declaration -->
   <script>
     Polymer('x-foo', {
       ready: function() {
@@ -36,15 +66,91 @@
     });
   </script>
 
+  <!-- script embedded in declaration -->
+  <!-- super follows declaration -->
+  <!-- script extends no script -->
+  <polymer-element name="x-zzif" extends="x-zap">
+    <template>
+      Zzif's Shadow Content [<shadow></shadow>]
+    </template>
+    <script>
+      Polymer('x-zzif', {
+        ready: function() {
+          this.squid = 'zink';
+        }
+      });
+    </script>
+  </polymer-element>
+
+  <!-- no script -->
+  <polymer-element name="x-zot">
+    <template>
+      Zot's Shadow Content
+    </template>
+  </polymer-element>
+
+  <!-- no script extends no script -->
+  <polymer-element name="x-zap" extends="x-zot">
+    <template>
+      Zap's Shadow Content [<shadow></shadow>]
+    </template>
+  </polymer-element>
+
+  <!-- script preceeding declaration -->
+  <script>
+    Polymer('x-fizz', {
+      ready: function() {
+        this.squid = 'fink';
+      }
+    });
+  </script>
+
+  <!-- w/script extends no script -->
+  <!-- script preceeds declaration -->
+  <polymer-element name="x-fizz" extends="x-zap">
+    <template>
+      Fizz's Shadow Content [<shadow></shadow>]
+    </template>
+  </polymer-element>
+
+  <!-- async script -->
+  <polymer-element name="x-blarg" async>
+    <template>
+      Blarg's Shadow Content (async)
+    </template>
+    <!-- async script -->
+    <script>
+      document.addEventListener('WebComponentsReady', function() {
+        setTimeout(function() {
+          Polymer('x-blarg', {
+            ready: function() {
+              this.squid = 'bink';
+            }
+          });
+          test();
+        }, 300);
+      });
+    </script>
+  </polymer-element>
+
   <script>
     var assert = chai.assert;
-    document.addEventListener('WebComponentsReady', function() {
+    function test() {
+    //document.addEventListener('WebComponentsReady', function() {
       var foo = document.querySelector('x-foo');
       assert.equal(foo.squid, 'ink');
       var bar = document.querySelector('x-bar');
       assert.equal(bar.squid, 'ink');
+      var zot = document.querySelector('x-zot');
+      assert.ok(zot.shadowRoot);
+      var zap = document.querySelector('x-zap');
+      assert.ok(zap.shadowRoot);
+      var fizz = document.querySelector('x-fizz');
+      assert.equal(fizz.squid, 'fink');
+      var zzif = document.querySelector('x-zzif');
+      assert.equal(zzif.squid, 'zink');
       done();
-    });
+    }
   </script>
   
 </body>
diff --git a/test/js/register.js b/test/js/register.js
index 274e04dfed..00ea17f2a4 100644
--- a/test/js/register.js
+++ b/test/js/register.js
@@ -6,9 +6,9 @@
 
 suite('register', function() {
   var assert = chai.assert;
-  
+
   var work;
-  
+
   setup(function() {
     work = document.createElement('div');
     wrap(document.body).appendChild(work);

From 5b8f43a6a26000452107c2f8e16f3b7b210978b4 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Fri, 2 Aug 2013 19:00:47 -0700
Subject: [PATCH 06/19] punt 'async' for 'noscript' because of imports-polyfill
 timing; remove wait list entries after using them

---
 src/declaration/polymer-element.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 40dd8e75e6..b50e78de35 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -24,6 +24,7 @@
 
   // specify an 'own' prototype for tag `name`
   function element(name, prototype) {
+    //console.log('registering [' + name + ']');
     // cache the prototype
     registry[name] = prototype || {};
     // notify the registrar waiting for 'name', if any
@@ -33,6 +34,7 @@
   function notifyPrototype(name) {
     if (waitPrototype[name]) {
       waitPrototype[name].registerWhenReady();
+      delete waitPrototype[name];
     }
   }
 
@@ -45,6 +47,7 @@
       waiting.forEach(function(w) {
         w.registerWhenReady();
       });
+      delete waitSuper[name];
     }
   }
 
@@ -88,14 +91,29 @@
       if (!getRegisteredPrototype(name)) {
         // then wait for a prototype
         waitPrototype[name] = this;
+        // TODO(sjmiles): there is currently a massive delay between parsing
+        // HTML in imports and executing script that foils this `async` gambit
+        // Ideally the import polyfill has timing closer to the real deal; in
+        // the meantime, invert the strategy and require `noscript` marking
+        // instead.
+        /*
         // if we are not explicitly async,
         // then wait for end of microtask(-ish)
         // and use whatever prototype is available
         if (!this.hasAttribute('async')) {
           setTimeout(function() {
             if (!getRegisteredPrototype(name)) {
+              console.warn('giving up waiting for script for [' + name + ']');
               element(name, null);
             }
+          }, 3000);
+        }
+        */
+        if (this.hasAttribute('noscript')) {
+          // go async so the parser can process the element's children before
+          // registration
+          setTimeout(function() {
+            element(name, null);
           }, 0);
         }
         return;

From db1ee09e4fcaf6cb526aa0828543d19de1abe9b8 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Sun, 4 Aug 2013 09:45:22 -0700
Subject: [PATCH 07/19] when using HTMLImports polyfill, defer processing
 polymer-elements in the main document until HTMLImportsLoaded

---
 src/declaration/polymer-element.js | 32 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index b50e78de35..d17219a604 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -91,7 +91,7 @@
       if (!getRegisteredPrototype(name)) {
         // then wait for a prototype
         waitPrototype[name] = this;
-        // TODO(sjmiles): there is currently a massive delay between parsing
+        // TODO(sjmiles): there is a massive asynchrony between parsing
         // HTML in imports and executing script that foils this `async` gambit
         // Ideally the import polyfill has timing closer to the real deal; in
         // the meantime, invert the strategy and require `noscript` marking
@@ -119,20 +119,28 @@
         return;
       }
       // fetch our extendee name
-      var extnds = this.getAttribute('extends');
+      var extendee = this.getAttribute('extends');
       // if extending a custom element...
-      if (extnds && extnds.indexOf('-') >= 0) {
+      if (extendee && extendee.indexOf('-') >= 0) {
         // wait for the extendee to be registered first
-        if (!getRegisteredPrototype(extnds)) {
-          (waitSuper[extnds] = (waitSuper[extnds] || [])).push(this);
+        if (!getRegisteredPrototype(extendee)) {
+          (waitSuper[extendee] = (waitSuper[extendee] || [])).push(this);
           return;
         }
       }
-      this.register(name, extnds);
+      // TODO(sjmiles): HTMLImports polyfill awareness
+      if (document.contains(this) && window.HTMLImports && !HTMLImports.readyTime) {
+        addEventListener('HTMLImportsLoaded', function() {
+          this.register(name, extendee);
+        }.bind(this));
+      } else {
+        this.register(name, extendee);
+      }
     },
-    register: function(name, extnds) {
+    register: function(name, extendee) {
+      console.log(name, extendee);
       // build prototype combining extendee, Polymer base, and named api
-      this.prototype = this.generateCustomPrototype(name, extnds);
+      this.prototype = this.generateCustomPrototype(name, extendee);
       // backref
       this.prototype.element = this;
       // TODO(sorvell): install a helper method this.resolvePath to aid in 
@@ -146,7 +154,7 @@
       this.desugar();
       // under ShadowDOMPolyfill, transforms to approximate missing CSS features
       if (window.ShadowDOMPolyfill) {
-        Platform.ShadowCSS.shimStyling(this.templateContent(), name, extnds);
+        Platform.ShadowCSS.shimStyling(this.templateContent(), name, extendee);
       }
       // register our custom element
       this.registerPrototype(name);
@@ -240,12 +248,12 @@
   // register polymer-element with document
 
   document.register('polymer-element', {prototype: prototype});
-  
-  // namespace shenanigans
+
+  // namespace shenanigans so we can expose our scope on the registration function
 
   // TODO(sjmiles): find a way to do this that is less terrible
   // copy window.Polymer properties onto `element()`
-  extend(element, window.Polymer);
+  extend(element, scope);
   // make window.Polymer reference `element()`
   window.Polymer = element;
 

From a32297a7fac40f4c329882a02364854a99bc37f8 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Sun, 4 Aug 2013 17:50:10 -0700
Subject: [PATCH 08/19] disable logging

---
 src/declaration/polymer-element.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index d17219a604..e2b5c34cb9 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -138,7 +138,7 @@
       }
     },
     register: function(name, extendee) {
-      console.log(name, extendee);
+      //console.log(name, extendee);
       // build prototype combining extendee, Polymer base, and named api
       this.prototype = this.generateCustomPrototype(name, extendee);
       // backref

From e71476dbe7354b2208237028021d39a6d5aedb27 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Sun, 4 Aug 2013 21:32:19 -0700
Subject: [PATCH 09/19] fix test: need to include noscript where appropriate.

---
 test/html/element-registration.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/html/element-registration.html b/test/html/element-registration.html
index bbf415b9f2..523d35708e 100644
--- a/test/html/element-registration.html
+++ b/test/html/element-registration.html
@@ -51,7 +51,7 @@
 
   <!-- no script extends w/script -->
   <!-- super script follows declaration -->
-  <polymer-element name="x-quux" extends="x-foo">
+  <polymer-element name="x-quux" extends="x-foo" noscript>
     <template>
       Quux's Shadow Content [<shadow></shadow>]
     </template>
@@ -83,14 +83,14 @@
   </polymer-element>
 
   <!-- no script -->
-  <polymer-element name="x-zot">
+  <polymer-element name="x-zot" noscript>
     <template>
       Zot's Shadow Content
     </template>
   </polymer-element>
 
   <!-- no script extends no script -->
-  <polymer-element name="x-zap" extends="x-zot">
+  <polymer-element name="x-zap" extends="x-zot" noscript>
     <template>
       Zap's Shadow Content [<shadow></shadow>]
     </template>
@@ -114,7 +114,7 @@
   </polymer-element>
 
   <!-- async script -->
-  <polymer-element name="x-blarg" async>
+  <polymer-element name="x-blarg">
     <template>
       Blarg's Shadow Content (async)
     </template>

From 0f1552995614c6a4af9053fa03ba3fe46a388c95 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Mon, 5 Aug 2013 00:05:02 -0700
Subject: [PATCH 10/19] update test

---
 test/html/element-script.html | 53 ++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/test/html/element-script.html b/test/html/element-script.html
index 48cb7e24d9..c2b2d6236a 100644
--- a/test/html/element-script.html
+++ b/test/html/element-script.html
@@ -41,13 +41,10 @@
   </polymer-element>
 
   <!-- no script -->
-  <polymer-element name="x-zot" extends="x-foo">
+  <polymer-element name="x-zot" extends="x-foo" noscript>
     <template>
       Hello Lighter World [<shadow></shadow>]
     </template>
-    <script>
-      Polymer('x-zot');
-    </script>
   </polymer-element>
 
   <!-- inline script -->
@@ -84,28 +81,32 @@
   <script>
     var assert = chai.assert;
     document.addEventListener('WebComponentsReady', function() {
-      var foo = document.querySelector('x-foo');
-      assert.equal(getComputedStyle(foo).color, 'rgb(0, 0, 255)');
-      //
-      var bar = document.querySelector('x-bar');
-      assert.equal(getComputedStyle(bar).color, 'rgb(0, 0, 255)');
-      assert.equal(getComputedStyle(bar).backgroundColor, 'rgb(255, 165, 0)');
-      //
-      var zot = document.querySelector('x-zot');
-      assert.equal(getComputedStyle(zot).color, 'rgb(0, 0, 255)');
-      //
-      var baz = document.querySelector('x-baz');
-      assert.equal(getComputedStyle(baz).color, 'rgb(0, 0, 255)');
-      assert.equal(getComputedStyle(baz).backgroundColor, 'rgb(255, 99, 71)');
-      //
-      var qux = document.querySelector('x-qux');
-      assert.equal(getComputedStyle(qux).color, 'rgb(0, 0, 255)');
-      assert.equal(getComputedStyle(qux).backgroundColor, 'rgb(0, 128, 0)');
-      //
-      var quux = document.querySelector('x-quux');
-      assert.equal(getComputedStyle(quux).color, 'rgb(0, 0, 255)');
-      assert.equal(getComputedStyle(quux).fontSize, '24px');
-      done();
+      // TODO(sorvell): under CE polyfill, noscript is not ready at WCR time
+      // so need timeout or zot test fails.
+      setTimeout(function() {
+        var foo = document.querySelector('x-foo');
+        assert.equal(getComputedStyle(foo).color, 'rgb(0, 0, 255)');
+        //
+        var bar = document.querySelector('x-bar');
+        assert.equal(getComputedStyle(bar).color, 'rgb(0, 0, 255)');
+        assert.equal(getComputedStyle(bar).backgroundColor, 'rgb(255, 165, 0)');
+        //
+        var zot = document.querySelector('x-zot');
+        assert.equal(getComputedStyle(zot).color, 'rgb(0, 0, 255)');
+        //
+        var baz = document.querySelector('x-baz');
+        assert.equal(getComputedStyle(baz).color, 'rgb(0, 0, 255)');
+        assert.equal(getComputedStyle(baz).backgroundColor, 'rgb(255, 99, 71)');
+        //
+        var qux = document.querySelector('x-qux');
+        assert.equal(getComputedStyle(qux).color, 'rgb(0, 0, 255)');
+        assert.equal(getComputedStyle(qux).backgroundColor, 'rgb(0, 128, 0)');
+        //
+        var quux = document.querySelector('x-quux');
+        assert.equal(getComputedStyle(quux).color, 'rgb(0, 0, 255)');
+        assert.equal(getComputedStyle(quux).fontSize, '24px');
+        done();
+      }, 0);
     });
   </script>
   

From f9897444cda91a0dc8fe0548e277092412293fb7 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Mon, 5 Aug 2013 00:06:41 -0700
Subject: [PATCH 11/19] wait for extendors to fully register before registering
 extendees

---
 src/declaration/polymer-element.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index e2b5c34cb9..df79e05626 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -40,8 +40,14 @@
 
   // elements waiting for super, by name
   var waitSuper = {};
-
+  var registered = {};
+  
+  function isRegistered(name) {
+    return registered[name];
+  }
+  
   function notifySuper(name) {
+    registered[name] = true;
     var waiting = waitSuper[name];
     if (waiting) {
       waiting.forEach(function(w) {
@@ -123,7 +129,7 @@
       // if extending a custom element...
       if (extendee && extendee.indexOf('-') >= 0) {
         // wait for the extendee to be registered first
-        if (!getRegisteredPrototype(extendee)) {
+        if (!isRegistered(extendee)) {
           (waitSuper[extendee] = (waitSuper[extendee] || [])).push(this);
           return;
         }
@@ -138,7 +144,7 @@
       }
     },
     register: function(name, extendee) {
-      //console.log(name, extendee);
+      //console.log('register', name, extendee);
       // build prototype combining extendee, Polymer base, and named api
       this.prototype = this.generateCustomPrototype(name, extendee);
       // backref

From f1c8e2b32d557a7cae11c8759178980a2ddcc45f Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Mon, 5 Aug 2013 13:28:07 -0700
Subject: [PATCH 12/19] slight clean up

---
 src/declaration/polymer-element.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index df79e05626..abe59894e2 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -13,10 +13,10 @@
   // imperative implementation: Polymer()
   
   // maps tag names to prototypes
-  var registry = {};
+  var prototypesByName = {};
 
   function getRegisteredPrototype(name) {
-    return registry[name];
+    return prototypesByName[name];
   }
 
   // elements waiting for prototype, by name
@@ -26,7 +26,7 @@
   function element(name, prototype) {
     //console.log('registering [' + name + ']');
     // cache the prototype
-    registry[name] = prototype || {};
+    prototypesByName[name] = prototype || {};
     // notify the registrar waiting for 'name', if any
     notifyPrototype(name);
   }
@@ -40,12 +40,7 @@
 
   // elements waiting for super, by name
   var waitSuper = {};
-  var registered = {};
-  
-  function isRegistered(name) {
-    return registered[name];
-  }
-  
+
   function notifySuper(name) {
     registered[name] = true;
     var waiting = waitSuper[name];
@@ -57,6 +52,14 @@
     }
   }
 
+  // track document.register'ed tag names
+
+  var registered = {};
+
+  function isRegistered(name) {
+    return registered[name];
+  }
+
   // returns a prototype that chains to <tag> or HTMLElement
   function generatePrototype(tag) {
     return Object.create(HTMLElement.getPrototypeForTag(tag));

From 0ce96cfb5155fb2027209497158b90cda90e65d9 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Mon, 5 Aug 2013 14:13:57 -0700
Subject: [PATCH 13/19] freshen tools

---
 tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools b/tools
index 313f7524ce..0a686e1b6d 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 313f7524ce37689ebfb60c81f7bda721535467cf
+Subproject commit 0a686e1b6d01612346563704a460fe50ee0d6a9e

From 1d01fcd4aabeb2627374b33ea576b4db4c45d5f7 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Mon, 5 Aug 2013 14:14:40 -0700
Subject: [PATCH 14/19] remove explicit ShadowDOM polyfill tests. Test runner
 can be run with ?shadow and this should now run all tests under the polyfill.

---
 test/js/bindMDV.js    | 2 --
 test/js/mdv-syntax.js | 1 -
 test/js/styling.js    | 1 -
 3 files changed, 4 deletions(-)

diff --git a/test/js/bindMDV.js b/test/js/bindMDV.js
index db1b73061f..d3b0fd7164 100644
--- a/test/js/bindMDV.js
+++ b/test/js/bindMDV.js
@@ -52,7 +52,5 @@ suite('bindMDV', function() {
 
 htmlSuite('unbind', function() {
   htmlTest('html/template-distribute-dynamic.html');
-  htmlTest('html/template-distribute-dynamic.html?shadow');
   htmlTest('html/unbind.html');
-  htmlTest('html/unbind.html?shadow');
 });
\ No newline at end of file
diff --git a/test/js/mdv-syntax.js b/test/js/mdv-syntax.js
index 03c6a56b8b..7d7600bddd 100644
--- a/test/js/mdv-syntax.js
+++ b/test/js/mdv-syntax.js
@@ -11,5 +11,4 @@ htmlSuite('MDV syntax', function() {
   if (!window.ShadowDOMPolyfill) {
     htmlTest('html/mdv-syntax.html');
   }
-  //htmlTest('html/mdv-syntax.html?shadow');
 });
diff --git a/test/js/styling.js b/test/js/styling.js
index d9fee3c260..6655a99520 100644
--- a/test/js/styling.js
+++ b/test/js/styling.js
@@ -5,7 +5,6 @@
  */
 htmlSuite('styling', function() {
   htmlTest('html/styling/sheet-order.html');
-  htmlTest('html/styling/sheet-order.html?shadow');
   htmlTest('html/styling/sheet-main-doc.html');
   htmlTest('html/styling/apply-reset-styles.html');
 });

From aa26e8e7b366a1df99b322afd256d27c3f57b2f1 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Mon, 5 Aug 2013 17:27:39 -0700
Subject: [PATCH 15/19] restore 'async' flag instead of 'noscript' (will be
 removed directly because it doesn't actually work, putting it here so the
 code is tracked in source control)

---
 src/declaration/polymer-element.js | 57 +++++++++++++++++-------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index abe59894e2..091ad3ff67 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -6,12 +6,12 @@
 (function(scope) {
 
   // imports
-  
+
   var extend = Polymer.extend;
   var apis = scope.api.declaration;
 
   // imperative implementation: Polymer()
-  
+
   // maps tag names to prototypes
   var prototypesByName = {};
 
@@ -64,7 +64,7 @@
   function generatePrototype(tag) {
     return Object.create(HTMLElement.getPrototypeForTag(tag));
   }
-  
+
   // On platforms that do not support __proto__ (IE10), the prototype chain
   // of a custom element is simulated via installation of __proto__.
   // Although custom elements manages this, we install it here so it's 
@@ -79,6 +79,14 @@
     }
   }
 
+  function whenImportsLoaded(doThis) {
+    if (window.HTMLImports && !HTMLImports.readyTime) {
+      addEventListener('HTMLImportsLoaded', doThis);
+    } else {
+      doThis();
+    }
+  }
+
   // declarative implementation: <polymer-element>
 
   var prototype = generatePrototype();
@@ -100,30 +108,31 @@
       if (!getRegisteredPrototype(name)) {
         // then wait for a prototype
         waitPrototype[name] = this;
-        // TODO(sjmiles): there is a massive asynchrony between parsing
-        // HTML in imports and executing script that foils this `async` gambit
-        // Ideally the import polyfill has timing closer to the real deal; in
-        // the meantime, invert the strategy and require `noscript` marking
-        // instead.
-        /*
-        // if we are not explicitly async,
-        // then wait for end of microtask(-ish)
-        // and use whatever prototype is available
+        // if we are not explicitly async...
         if (!this.hasAttribute('async')) {
-          setTimeout(function() {
+          // then we expect the script to be registered
+          // by end of microtask(-ish) and can otherwise
+          // consider this element to have no script
+          //
+          // TODO(sjmiles):
+          // we have to wait for end-of-microtask because
+          // native CE upgrades polymer-element (any custom
+          // element, really) *before* it's children are
+          // parsed, and it's common for the script to
+          // exist as a child of the polymer-element
+          //
+          // additionally, there is a massive asynchrony
+          // between parsing HTML in imports and executing
+          // script that foils the end of microtask gambit
+          // Waiting on HTMLImportsLoaded signal solves
+          // both timing problems for imports loaded
+          // at startup under the import polyfill
+          whenImportsLoaded(function() {
             if (!getRegisteredPrototype(name)) {
               console.warn('giving up waiting for script for [' + name + ']');
               element(name, null);
             }
-          }, 3000);
-        }
-        */
-        if (this.hasAttribute('noscript')) {
-          // go async so the parser can process the element's children before
-          // registration
-          setTimeout(function() {
-            element(name, null);
-          }, 0);
+          });
         }
         return;
       }
@@ -138,8 +147,8 @@
         }
       }
       // TODO(sjmiles): HTMLImports polyfill awareness
-      if (document.contains(this) && window.HTMLImports && !HTMLImports.readyTime) {
-        addEventListener('HTMLImportsLoaded', function() {
+      if (document.contains(this)) {
+        whenImportsLoaded(function() {
           this.register(name, extendee);
         }.bind(this));
       } else {

From 6758e2685cbaa952b07e15985998898bcca6a159 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Mon, 5 Aug 2013 18:12:13 -0700
Subject: [PATCH 16/19] restore 'noscript' gambit, add comments to explain
 these problems

---
 src/declaration/polymer-element.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 091ad3ff67..9bb69e7590 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -108,6 +108,21 @@
       if (!getRegisteredPrototype(name)) {
         // then wait for a prototype
         waitPrototype[name] = this;
+        // TODO(sjmiles): 'noscript' gambit is mutually exclusive
+        // with 'async' gambit below
+        //
+        // if explicitly marked as 'noscript'
+        if (this.hasAttribute('noscript')) {
+          // go async to allow children to parse
+          setTimeout(function() {
+            // register with the default prototype
+            element(name, null);
+          }, 0);
+        }
+        // TODO(sjmiles): 'async' gambit is deemed too dangerous
+        // because it changes the timing of noscript elements
+        // in import from 'timeout 0' to 'HTMLImportsReady'
+        /*
         // if we are not explicitly async...
         if (!this.hasAttribute('async')) {
           // then we expect the script to be registered
@@ -134,6 +149,7 @@
             }
           });
         }
+        */
         return;
       }
       // fetch our extendee name
@@ -147,6 +163,11 @@
         }
       }
       // TODO(sjmiles): HTMLImports polyfill awareness
+      // elements in the main document are likely to parse
+      // in advance of elements in imports because the
+      // polyfill parser is simulated
+      // therefore, wait for imports loaded before
+      // finalizing elements in the main document
       if (document.contains(this)) {
         whenImportsLoaded(function() {
           this.register(name, extendee);

From f1c8d90c8c63108dc9366b910cdbe592fe038b30 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Tue, 6 Aug 2013 18:49:49 -0700
Subject: [PATCH 17/19] Fixes issue #230

---
 src/instance/events.js                        |  2 +-
 test/html/event-path-declarative.html         | 10 ++-
 test/html/event-path-getDistributedNodes.html | 76 -------------------
 test/js/events.js                             |  6 +-
 4 files changed, 9 insertions(+), 85 deletions(-)
 delete mode 100644 test/html/event-path-getDistributedNodes.html

diff --git a/src/instance/events.js b/src/instance/events.js
index 23a30b654e..b10100cf9d 100644
--- a/src/instance/events.js
+++ b/src/instance/events.js
@@ -85,7 +85,7 @@
     if (!event.cancelBubble) {
       event.on = EVENT_PREFIX + event.type;
       log.events && console.group("[%s]: listenLocal [%s]", host.localName, event.on);
-      if (!event.path || window.ShadowDOMPolyfill) {
+      if (!event.path) {
         _listenLocalNoEventPath(host, event);
       } else {
         _listenLocal(host, event);
diff --git a/test/html/event-path-declarative.html b/test/html/event-path-declarative.html
index 91bb74c3fd..9b26b0e954 100644
--- a/test/html/event-path-declarative.html
+++ b/test/html/event-path-declarative.html
@@ -120,9 +120,13 @@
         }
       }
       
-      document.addEventListener('WebComponentsReady', function() {
-        var target = document.querySelector('#target');
-        target.dispatchEvent(new CustomEvent('test-event', {bubbles: true}));
+      document.addEventListener('WebComponentsReady', function(e) {
+        if (e.path) {
+          var target = document.querySelector('#target');
+          target.dispatchEvent(new CustomEvent('test-event', {bubbles: true}));
+        } else {
+          console.log('skipping event.path test since it\'s not supported');
+        }
         done();
       });
       
diff --git a/test/html/event-path-getDistributedNodes.html b/test/html/event-path-getDistributedNodes.html
deleted file mode 100644
index 80679b2a5e..0000000000
--- a/test/html/event-path-getDistributedNodes.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>event path</title>
-    <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
-  </head>
-  <body>
-
-  <x-menu-button id="menuButton" foo="foo">
-    <div id="item1">Item</div>
-  </x-menu-button>
-  
-  <polymer-element name="x-selector" attributes="selected">
-    <template>
-      <content id="selectorContent"></content>
-    </template>
-    <script>
-      Polymer('x-selector', {
-        selectedChanged: function() {
-          var distributed = this.$.selectorContent.getDistributedNodes()
-          console.log('must access distributed nodes', distributed);
-        }
-      });
-    </script>  
-  </polymer-element>
-  
-  <polymer-element name="x-menu-button" attributes="foo">
-    <template>
-      <div foo="{{foo}}">
-        <x-selector id="selector" selected="0">
-          <content id="menuButtonContent"></content>
-        </x-selector>
-      </div>
-    </template>
-    <script>
-      Polymer('x-menu-button');
-    </script>
-  </polymer-element>
-  
-  <script>
-    document.addEventListener('WebComponentsReady', function() {
-      setTimeout(function() {
-        item1 = wrap(item1);
-        menuButton = wrap(menuButton);
-        selector = menuButton.$.selector;
-
-        path = [
-          item1,
-          menuButton.$.menuButtonContent,
-          selector.$.selectorContent,
-          selector.webkitShadowRoot,
-          selector,
-          menuButton.webkitShadowRoot,
-          menuButton
-        ];
-
-        var x = 0;
-        path.forEach(function(n, i) {
-          n.addEventListener('x', function(e) {
-            console.log(e.currentTarget.localName + ':' + e.currentTarget.id);
-            chai.assert.equal(e.currentTarget.id, n.id, 'menu current target is as expected');
-            chai.assert.equal(x++, i, 'event listener order is correct');
-            if (i == path.length-1) {
-              done();
-            }
-          });
-        });
-
-        item1.dispatchEvent(new Event('x', {bubbles: true}));
-      });
-    })
-  </script>
-  </body>
-</html>
diff --git a/test/js/events.js b/test/js/events.js
index b92bfaf696..7e66bd8dbf 100644
--- a/test/js/events.js
+++ b/test/js/events.js
@@ -68,9 +68,5 @@ suite('events', function() {
 
 htmlSuite('events-declarative', function() {
   htmlTest('html/event-path.html');
-  // TODO(sorvell): include when we expect to pass
-  //htmlTest('html/event-path-getDistributedNodes.html');
-  // TODO(sorvell): include when we expect to pass; currently expected
-  // to pass only in Canary with expr. features on.
-  //htmlTest('html/event-path-declarative.html');
+  htmlTest('html/event-path-declarative.html');
 });
\ No newline at end of file

From aafd5fc78cd9a6db61c91b544c6abb96be87757d Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Tue, 6 Aug 2013 18:52:42 -0700
Subject: [PATCH 18/19] freshen tools

---
 tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools b/tools
index 0a686e1b6d..b853b33b56 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 0a686e1b6d01612346563704a460fe50ee0d6a9e
+Subproject commit b853b33b567fd2c67f51be3eae7022e4eded07f4

From b9429fd6820335f544c33c53214cd700738f513a Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Thu, 8 Aug 2013 15:03:38 -0700
Subject: [PATCH 19/19] add //@version string to polymer builds

---
 gruntfile.js | 3 ++-
 package.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 1b102435b3..145c1e3913 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -4,6 +4,7 @@
  * license that can be found in the LICENSE file.
  */
 module.exports = function(grunt) {
+  var banner = [grunt.file.read('LICENSE'), '// @version ' + grunt.file.readJSON('package.json').version, ''].join(grunt.util.linefeed);
   Platform = [
     '../platform/platform.min.js'
   ];
@@ -81,7 +82,7 @@ module.exports = function(grunt) {
     },
     uglify: {
       options: {
-        banner: grunt.file.read('LICENSE'),
+        banner: banner,
         nonull: true
       },
       Polymer: {
diff --git a/package.json b/package.json
index 877784466e..35ce1f6458 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Polymer",
-  "version": "0.0.1",
+  "version": "0.0.20130808",
   "devDependencies": {
     "mocha": "*",
     "chai": "*",