From 17a4e5964306775d2efa1555553f6acb5cef22b9 Mon Sep 17 00:00:00 2001
From: Chris Buckett <chrisbuckett@gmail.com>
Date: Fri, 9 Aug 2013 14:36:10 +0100
Subject: [PATCH 01/15] Updated polymer registration for current SDK

---
 workbench/events/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/workbench/events/index.html b/workbench/events/index.html
index bf50c4fde5..e1cfe5dd0b 100644
--- a/workbench/events/index.html
+++ b/workbench/events/index.html
@@ -21,7 +21,7 @@ <h4>Custom element using declarative events</h4>
       without event path, only host event fires.)</div>
   </x-basic>
   
-  <element name="x-basic" on-click="hostClickHandler">
+  <polymer-element name="x-basic" on-click="hostClickHandler">
     <template>
       <style>
         @host {
@@ -43,7 +43,7 @@ <h4>Custom element using declarative events</h4>
       </div>
     </template>
     <script>
-      Polymer.register(this, {
+      Polymer('x-basic', {
         hostClickHandler: function(inEvent, inDetail, inSender) {
           console.log('clicked on host!', this.localName, inEvent);
         },
@@ -55,13 +55,13 @@ <h4>Custom element using declarative events</h4>
         }
       });
     </script>
-  </element>
+  </polymer-element>
 
   <h4>Composed custom elements using declarative events</h4>
 
   <x-simple-composed></x-simple-composed>
   
-  <element name="x-simple-composed" on-click="hostClickHandler">
+  <polymer-element name="x-simple-composed" on-click="hostClickHandler">
     <template>
       <style>
         @host {
@@ -84,7 +84,7 @@ <h4>Composed custom elements using declarative events</h4>
       </x-basic>
     </template>
     <script>
-      Polymer.register(this, {
+      Polymer('x-simple-composed', {
         hostClickHandler: function(inEvent, inDetail, inSender) {
           console.log('clicked on host!', this.localName, inEvent);
         },
@@ -93,7 +93,7 @@ <h4>Composed custom elements using declarative events</h4>
         }
       });
     </script>
-  </element>
+  </polymer-element>
 
 
 </body>

From 549afe0f8257c2f45a7055349bead7e1ae526468 Mon Sep 17 00:00:00 2001
From: Chris Buckett <chrisbuckett@gmail.com>
Date: Fri, 9 Aug 2013 14:41:13 +0100
Subject: [PATCH 02/15] Updated polymer registration for current SDK

---
 workbench/mdv/memory-compound.html  | 6 +++---
 workbench/mdv/memory-manual.html    | 6 +++---
 workbench/mdv/memory-no-insert.html | 6 +++---
 workbench/mdv/memory.html           | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/workbench/mdv/memory-compound.html b/workbench/mdv/memory-compound.html
index 08ba8fb0cf..0547bd2b23 100644
--- a/workbench/mdv/memory-compound.html
+++ b/workbench/mdv/memory-compound.html
@@ -17,7 +17,7 @@
   <button onclick="continuous()">Continuous</button>
   <div id="work"></div>
   
-  <element name="x-test">
+  <polymer-element name="x-test">
     <template>
       <style>
         @host {
@@ -44,7 +44,7 @@
       <div style="background: {{ten}};">ten</div>
     </template>
     <script>
-      Polymer.register(this, {
+      Polymer('x-test', {
         one: 'tomato',
         two: 'steelblue',
         three: 'whitesmoke',
@@ -77,7 +77,7 @@
         }
       });
     </script>
-  </element>
+  </polymer-element>
   <script>
     var work = document.querySelector('#work');
     
diff --git a/workbench/mdv/memory-manual.html b/workbench/mdv/memory-manual.html
index 1cb5b2fb9f..ec2d16c940 100644
--- a/workbench/mdv/memory-manual.html
+++ b/workbench/mdv/memory-manual.html
@@ -17,7 +17,7 @@
   <button onclick="continuous()">Continuous</button>
   <div id="work"></div>
   
-  <element name="x-test">
+  <polymer-element name="x-test">
     <template>
       <style>
         @host {
@@ -44,7 +44,7 @@
       <div foo="{{ten}}">ten</div>
     </template>
     <script>
-      Polymer.register(this, {
+      Polymer('x-test', {
         one: 'tomato',
         two: 'steelblue',
         three: 'whitesmoke',
@@ -79,7 +79,7 @@
         }
       });
     </script>
-  </element>
+  </polymer-element>
   <script>
     var work = document.querySelector('#work');
     
diff --git a/workbench/mdv/memory-no-insert.html b/workbench/mdv/memory-no-insert.html
index c6b035230f..4efa5e879c 100644
--- a/workbench/mdv/memory-no-insert.html
+++ b/workbench/mdv/memory-no-insert.html
@@ -17,7 +17,7 @@
   <button onclick="continuous()">Continuous</button>
   <div id="work"></div>
   
-  <element name="x-test">
+  <polymer-element name="x-test">
     <template>
       <style>
         @host {
@@ -44,7 +44,7 @@
       <div foo="{{ten}}">ten</div>
     </template>
     <script>
-      Polymer.register(this, {
+      Polymer('x-test', {
         one: 'tomato',
         two: 'steelblue',
         three: 'whitesmoke',
@@ -78,7 +78,7 @@
         }
       });
     </script>
-  </element>
+  </polymer-element>
   <script>
     var work = document.querySelector('#work');
     
diff --git a/workbench/mdv/memory.html b/workbench/mdv/memory.html
index 4fcab01ea9..ed06d1a0c9 100644
--- a/workbench/mdv/memory.html
+++ b/workbench/mdv/memory.html
@@ -17,7 +17,7 @@
   <button onclick="continuous()">Continuous</button>
   <div id="work"></div>
   
-  <element name="x-test">
+  <polymer-element name="x-test">
     <template>
       <style>
         @host {
@@ -44,7 +44,7 @@
       <div foo="{{ten}}">ten</div>
     </template>
     <script>
-      Polymer.register(this, {
+      Polymer('x-test', {
         one: 'tomato',
         two: 'steelblue',
         three: 'whitesmoke',
@@ -78,7 +78,7 @@
         }
       });
     </script>
-  </element>
+  </polymer-element>
   <script>
     var work = document.querySelector('#work');
     

From 76aecfa0d4dd0560810775e59d06354e77e5713a Mon Sep 17 00:00:00 2001
From: Chris Buckett <chrisbuckett@gmail.com>
Date: Fri, 9 Aug 2013 14:47:04 +0100
Subject: [PATCH 03/15] Updated polymer registration for current SDK

---
 workbench/oldSmoke/index.html | 2 +-
 workbench/oldSmoke/x-bar.html | 6 +++---
 workbench/oldSmoke/x-foo.html | 6 +++---
 workbench/oldSmoke/x-zot.html | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/workbench/oldSmoke/index.html b/workbench/oldSmoke/index.html
index 82757e6887..57343406a9 100644
--- a/workbench/oldSmoke/index.html
+++ b/workbench/oldSmoke/index.html
@@ -8,7 +8,7 @@
   <head>
     <meta charset="UTF-8">
     <title></title>
-    <script src="../polymer.js"></script>
+    <script src="../../polymer.js"></script>
     <link rel="import" href="x-foo.html">
     <link rel="import" href="x-bar.html">
     <link rel="import" href="x-zot.html">
diff --git a/workbench/oldSmoke/x-bar.html b/workbench/oldSmoke/x-bar.html
index 17e89c2f08..48ffe1b114 100644
--- a/workbench/oldSmoke/x-bar.html
+++ b/workbench/oldSmoke/x-bar.html
@@ -3,12 +3,12 @@
 Use of this source code is governed by a BSD-style
 license that can be found in the LICENSE file.
 -->
-<element name="x-bar">
+<polymer-element name="x-bar">
   <template>
     <content></content>
   </template>
   <script>
-    Polymer.register(this, {
+    Polymer('x-bar', {
       label: "tabula rasa",
       ready: function() {
         this.update();
@@ -18,4 +18,4 @@
       }
     });
   </script>
-</element>
\ No newline at end of file
+</polymer-element>
\ No newline at end of file
diff --git a/workbench/oldSmoke/x-foo.html b/workbench/oldSmoke/x-foo.html
index 5c7caaaecb..59440c1ecd 100644
--- a/workbench/oldSmoke/x-foo.html
+++ b/workbench/oldSmoke/x-foo.html
@@ -3,13 +3,13 @@
 Use of this source code is governed by a BSD-style
 license that can be found in the LICENSE file.
 -->
-<element name="x-foo">
+<polymer-element name="x-foo">
   <template>
     It LIVES <content></content>
     <x-bar label="{{label}}"></x-bar>
   </template>
   <script>
-    Polymer.register(this, {
+    Polymer('x-foo', {
       label: '',
       ready: function(root) {
         this.textContent = 'cordon bleu';
@@ -20,4 +20,4 @@
       }
     });
   </script>
-</element>
+</polymer-element>
diff --git a/workbench/oldSmoke/x-zot.html b/workbench/oldSmoke/x-zot.html
index 2d5710f52b..01869c8cdc 100644
--- a/workbench/oldSmoke/x-zot.html
+++ b/workbench/oldSmoke/x-zot.html
@@ -3,12 +3,12 @@
 Use of this source code is governed by a BSD-style
 license that can be found in the LICENSE file.
 -->
-<element name="x-zot" extends="x-foo">
+<polymer-element name="x-zot" extends="x-foo">
   <template>
     <shadow></shadow>
   </template>
   <script>
-    Polymer.register(this, {
+    Polymer('x-zot', {
     });
   </script>
-</element>
+</polymer-element>

From 2e95d97ff22f1de3c99b7b5272c62d0b10b6b9c8 Mon Sep 17 00:00:00 2001
From: Chris Buckett <chrisbuckett@gmail.com>
Date: Fri, 9 Aug 2013 14:51:32 +0100
Subject: [PATCH 04/15] Updated polymer registration for current SDK

---
 workbench/styling/host.html | 18 +++++++++---------
 workbench/styling/zim.html  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/workbench/styling/host.html b/workbench/styling/host.html
index 06f15d6776..ee98390b24 100644
--- a/workbench/styling/host.html
+++ b/workbench/styling/host.html
@@ -23,7 +23,7 @@ <h4>Expected: red background with blue text and orange border</h4>
   <h4>Expected: red background with blue text and orange border and 20px padding</h4>
   <x-zim></x-zim>
   
-  <element name="x-foo">
+  <polymer-element name="x-foo">
     <template>
       <style>
         @host {
@@ -35,10 +35,10 @@ <h4>Expected: red background with blue text and orange border and 20px padding</
       </style>
       <div>red background</div>
     </template>
-    <script>Polymer.register(this)</script>
-  </element>
+    <script>Polymer('x-foo')</script>
+  </polymer-element>
   
-  <element name="x-bar" extends="x-foo">
+  <polymer-element name="x-bar" extends="x-foo">
     <template>
       <style>
         @host {
@@ -50,10 +50,10 @@ <h4>Expected: red background with blue text and orange border and 20px padding</
       <shadow></shadow>
       <div>white text</div>
     </template>
-    <script>Polymer.register(this)</script>
-  </element>
+    <script>Polymer('x-bar')</script>
+  </polymer-element>
   
-  <element name="x-zot" extends="x-bar">
+  <polymer-element name="x-zot" extends="x-bar">
     <template>
       <style>
         @host {
@@ -65,8 +65,8 @@ <h4>Expected: red background with blue text and orange border and 20px padding</
       <shadow></shadow>
       <div>orange border & gray background</div>
     </template>
-    <script>Polymer.register(this)</script>
-  </element>
+    <script>Polymer('x-zot')</script>
+  </polymer-element>
   
   <link rel="import" href="zim.html">
 </body>
diff --git a/workbench/styling/zim.html b/workbench/styling/zim.html
index 24753ffe57..f40ea92dec 100644
--- a/workbench/styling/zim.html
+++ b/workbench/styling/zim.html
@@ -1,8 +1,8 @@
-<element name="x-zim" extends="x-zot">
+<polymer-element name="x-zim" extends="x-zot">
   <link rel="stylesheet" href="host.css">
   <template>
     <shadow></shadow>
     <div>padding: 20px</div>
   </template>
-  <script>Polymer.register(this)</script>
+  <script>Polymer('x-zim')</script>
 </element>

From 29c523a9a05359722270e945f807e6b528778d52 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Fri, 9 Aug 2013 16:28:30 -0700
Subject: [PATCH 05/15] improve noscript gambit.

---
 src/declaration/polymer-element.js | 44 +++---------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 9bb69e7590..185b4a6eea 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -108,48 +108,13 @@
       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);
+          var script = document.createElement('script');
+          script.textContent = 'Polymer(\'' + name + '\');';
+          this.appendChild(script);
+          
         }
-        // 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
-          // 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);
-            }
-          });
-        }
-        */
         return;
       }
       // fetch our extendee name
@@ -177,7 +142,6 @@
       }
     },
     register: function(name, extendee) {
-      //console.log('register', name, extendee);
       // build prototype combining extendee, Polymer base, and named api
       this.prototype = this.generateCustomPrototype(name, extendee);
       // backref

From 60247f516eea1752048d0437b4d15259dffd4c4b Mon Sep 17 00:00:00 2001
From: Steve Orvell <sorvell@google.com>
Date: Fri, 9 Aug 2013 17:47:37 -0700
Subject: [PATCH 06/15] adapt to mdv repo reorganization

---
 gruntfile.js        | 5 ++++-
 src/instance/mdv.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 145c1e3913..da3c7cb69b 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -140,7 +140,10 @@ module.exports = function(grunt) {
             '../CustomElements',
             '../PointerEvents',
             '../PointerGestures',
-            '../mdv'
+            '../PolymerExpressions',
+            '../ObserveJS',
+            '../Node-bind',
+            '../Template-instantiation'
           ]
         },
         dest: 'build.log',
diff --git a/src/instance/mdv.js b/src/instance/mdv.js
index 59f42e0d58..01b76552dd 100644
--- a/src/instance/mdv.js
+++ b/src/instance/mdv.js
@@ -11,7 +11,7 @@
 
   // use an MDV syntax
     
-  var mdv_syntax = new ExpressionSyntax();
+  var mdv_syntax = new PolymerExpressions();
 
   // element api supporting mdv
 

From 08c6a4709d6eb5e2eeb47580e593fbe58f7b39ab Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Mon, 12 Aug 2013 12:27:15 -0700
Subject: [PATCH 07/15] Call 'created' method when createdCallback is called.
 The ready method is still provided for bc.

---
 src/instance/base.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/instance/base.js b/src/instance/base.js
index 09289253f7..5ee15a26cf 100644
--- a/src/instance/base.js
+++ b/src/instance/base.js
@@ -10,7 +10,11 @@
     job: Polymer.job,
     super: Polymer.super,
     // user entry point for constructor-like initialization
+    created: function() {
+    },
+    // TODO(sorvell): temporary BC
     ready: function() {
+
     },
     // TODO(sjmiles): temporary BC
     readyCallback: function() {
@@ -40,7 +44,9 @@
       // when polyfilling Object.observe
       //this.asyncUnbindAll();
       // user initialization
+      // TODO(sorvell): bc
       this.ready();
+      this.created();
     },
     insertedCallback: function() {
       this._enteredDocumentCallback();

From 847de4afe5dbf8dbf838f576ebc3c26696cc2ade Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Mon, 12 Aug 2013 14:47:11 -0700
Subject: [PATCH 08/15] s/Loader/PolymerLoader

---
 polymer.js | 4 ++--
 tools      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/polymer.js b/polymer.js
index 3f8574ff47..50045ba858 100644
--- a/polymer.js
+++ b/polymer.js
@@ -50,10 +50,10 @@ var script = document.querySelector('script[src*="' + thisFile + '"]');
 var src = script.attributes.src.value;
 var basePath = src.slice(0, src.indexOf(thisFile));
 
-if (!window.Loader) {
+if (!window.PolymerLoader) {
   var path = basePath + 'tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
 } 
-document.write('<script>Loader.load("' + scopeName + '")</script>');
+document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');
   
 })();
diff --git a/tools b/tools
index b853b33b56..03ce077cc6 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit b853b33b567fd2c67f51be3eae7022e4eded07f4
+Subproject commit 03ce077cc6676eda5d87baa185a1519c273430c5

From a0d1b0dc92785246a18233e49a946a9170817785 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Mon, 12 Aug 2013 15:17:34 -0700
Subject: [PATCH 09/15] make tests not rely on synchronous Platform.flush

---
 test/html/prop-attr-reflection.html        | 70 ++++++++++++----------
 test/html/template-distribute-dynamic.html | 30 +++++-----
 test/html/unbind.html                      |  3 +
 3 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/test/html/prop-attr-reflection.html b/test/html/prop-attr-reflection.html
index b404c6ad84..eb0e3b61d2 100644
--- a/test/html/prop-attr-reflection.html
+++ b/test/html/prop-attr-reflection.html
@@ -36,38 +36,44 @@
         var xfoo = document.querySelector('x-foo');
         xfoo.foo = 5;
         Platform.flush();
-        assert.equal(String(xfoo.foo), xfoo.getAttribute('foo'), 'attribute reflects property as string');
-        xfoo.setAttribute('foo', '27');
-        assert.equal(xfoo.foo, xfoo.getAttribute('foo'), 'property reflects attribute');
-        //
-        xfoo.baz = 'Hello';
-        Platform.flush();
-        assert.equal(xfoo.baz, xfoo.getAttribute('baz'), 'attribute reflects property');
-        //
-        var xbar = document.querySelector('x-bar');
-        //
-        xbar.foo = 'foo!';
-        xbar.zot = 27;
-        xbar.zim = true;
-        xbar.str = 'str!';
-        xbar.obj = {hello: 'world'};
-        Platform.flush();
-        assert.equal(xbar.foo, xbar.getAttribute('foo'), 'inherited published property is reflected');
-        assert.equal(String(xbar.zot), xbar.getAttribute('zot'), 'attribute reflects property as number');
-        assert.equal(String(xbar.zim), xbar.getAttribute('zim'), 'attribute reflects property as boolean');
-        assert.equal(xbar.str, xbar.getAttribute('str'), 'attribute reflects property as published string');
-        assert.isFalse(xbar.hasAttribute('obj'), 'attribute does not reflect object property');
-        xbar.setAttribute('foo', 'foo!!');
-        xbar.setAttribute('zot', 54);
-        xbar.setAttribute('zim', 'false');
-        xbar.setAttribute('str', 'str!!');
-        xbar.setAttribute('obj', "{'hello': 'world'}");
-        assert.equal(xbar.foo, xbar.getAttribute('foo'), 'property reflects attribute as string');
-        assert.equal(xbar.zot, 54, 'property reflects attribute as number');
-        assert.equal(xbar.zim, false, 'property reflects attribute as boolean');
-        assert.equal(xbar.str, 'str!!', 'property reflects attribute as published string');
-        assert.deepEqual(xbar.obj, {hello: 'world'}, 'property reflects attribute as object');
-        done();
+        setTimeout(function() {
+          assert.equal(String(xfoo.foo), xfoo.getAttribute('foo'), 'attribute reflects property as string');
+          xfoo.setAttribute('foo', '27');
+          assert.equal(xfoo.foo, xfoo.getAttribute('foo'), 'property reflects attribute');
+          //
+          xfoo.baz = 'Hello';
+          Platform.flush();
+          setTimeout(function() {
+            assert.equal(xfoo.baz, xfoo.getAttribute('baz'), 'attribute reflects property');
+            //
+            var xbar = document.querySelector('x-bar');
+            //
+            xbar.foo = 'foo!';
+            xbar.zot = 27;
+            xbar.zim = true;
+            xbar.str = 'str!';
+            xbar.obj = {hello: 'world'};
+            Platform.flush();
+            setTimeout(function() {
+              assert.equal(xbar.foo, xbar.getAttribute('foo'), 'inherited published property is reflected');
+              assert.equal(String(xbar.zot), xbar.getAttribute('zot'), 'attribute reflects property as number');
+              assert.equal(String(xbar.zim), xbar.getAttribute('zim'), 'attribute reflects property as boolean');
+              assert.equal(xbar.str, xbar.getAttribute('str'), 'attribute reflects property as published string');
+              assert.isFalse(xbar.hasAttribute('obj'), 'attribute does not reflect object property');
+              xbar.setAttribute('foo', 'foo!!');
+              xbar.setAttribute('zot', 54);
+              xbar.setAttribute('zim', 'false');
+              xbar.setAttribute('str', 'str!!');
+              xbar.setAttribute('obj', "{'hello': 'world'}");
+              assert.equal(xbar.foo, xbar.getAttribute('foo'), 'property reflects attribute as string');
+              assert.equal(xbar.zot, 54, 'property reflects attribute as number');
+              assert.equal(xbar.zim, false, 'property reflects attribute as boolean');
+              assert.equal(xbar.str, 'str!!', 'property reflects attribute as published string');
+              assert.deepEqual(xbar.obj, {hello: 'world'}, 'property reflects attribute as object');
+              done();
+            });  
+          });
+        });
       });
     </script>
   </body>
diff --git a/test/html/template-distribute-dynamic.html b/test/html/template-distribute-dynamic.html
index e50a27b081..4c79cf0cb0 100644
--- a/test/html/template-distribute-dynamic.html
+++ b/test/html/template-distribute-dynamic.html
@@ -39,22 +39,24 @@
             Platform.flush();
             // tickle
             this.offsetHeight;
-            var children = this.$.echo.children;
+            setTimeout(function() {
+              var children = this.$.echo.children;
 
-            chai.assert.equal(children[0].localName, 'template',
-              'shadowDOM dynamic distribution via template');
-            chai.assert.equal(children[1].textContent, 'foo',
-              'shadowDOM dynamic distribution via template');
-            chai.assert.equal(children[2].textContent, 'bar',
-              'shadowDOM dynamic distribution via template');
+              chai.assert.equal(children[0].localName, 'template',
+                'shadowDOM dynamic distribution via template');
+              chai.assert.equal(children[1].textContent, 'foo',
+                'shadowDOM dynamic distribution via template');
+              chai.assert.equal(children[2].textContent, 'bar',
+                'shadowDOM dynamic distribution via template');
 
-            if (window.ShadowDOMPolyfill) {
-              var actualChildren = this.$.echo.impl.children;
-              chai.assert.equal(actualChildren.length, 4,
-                'shadowDOMPolyfill distributes expected number of actual children.');
-            }
-            done();
-          }.bind(this), 50);
+              if (window.ShadowDOMPolyfill) {
+                var actualChildren = this.$.echo.impl.children;
+                chai.assert.equal(actualChildren.length, 4,
+                  'shadowDOMPolyfill distributes expected number of actual children.');
+              }
+              done();
+            }.bind(this));
+          }.bind(this));
         }
       });
     </script>
diff --git a/test/html/unbind.html b/test/html/unbind.html
index 265857ccfd..1ef4f27f01 100644
--- a/test/html/unbind.html
+++ b/test/html/unbind.html
@@ -67,6 +67,9 @@
             'element is bound when not inserted');
           node.foo = 'bar';  
           Platform.flush();
+          return [node];
+        },
+        function(node) {
           chai.assert.isTrue(node.fooWasChanged, 'node is actually bound'); 
           var n = document.createElement('x-test');
           n.cancelUnbindAll();

From 86f8aa93331932f854e5a9d72d58b9c31e2acd5a Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Tue, 13 Aug 2013 08:52:50 -0700
Subject: [PATCH 10/15] add element import test.

---
 test/html/element-import.html        | 67 ++++++++++++++++++++++++++++
 test/html/element-import/elements.js | 13 ++++++
 test/html/element-import/import.html | 46 +++++++++++++++++++
 test/html/element-import/x-quux.js   |  6 +++
 test/html/element-registration.html  |  5 +--
 5 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 test/html/element-import.html
 create mode 100644 test/html/element-import/elements.js
 create mode 100644 test/html/element-import/import.html
 create mode 100644 test/html/element-import/x-quux.js

diff --git a/test/html/element-import.html b/test/html/element-import.html
new file mode 100644
index 0000000000..f7c67d1e59
--- /dev/null
+++ b/test/html/element-import.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<html>
+<head>
+  <title>element script</title>
+  <script src="../../polymer.js"></script>
+  <script src="../../tools/test/htmltest.js"></script>
+  <script src="../../node_modules/chai/chai.js"></script>
+  <link rel="import" href="element-import/import.html">
+</head>
+<body>
+  <x-foo></x-foo>  
+  <hr>
+  
+  <x-bar></x-bar>
+  <hr>
+  
+  <x-zot></x-zot>
+  <hr>
+
+  <x-baz></x-baz>
+  <hr>
+  
+  <x-qux></x-qux>
+  <hr>
+
+  <x-quux></x-quux>
+  <hr>
+
+  <!-- external script with super() -->
+  <polymer-element name="x-bar" extends="x-foo">
+    <template>
+      Hello Lighter World [<shadow></shadow>]
+    </template>
+  </polymer-element>
+  
+  <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();
+    });
+  </script>
+  
+</body>
+</html>
\ No newline at end of file
diff --git a/test/html/element-import/elements.js b/test/html/element-import/elements.js
new file mode 100644
index 0000000000..180694f037
--- /dev/null
+++ b/test/html/element-import/elements.js
@@ -0,0 +1,13 @@
+Polymer('x-foo', {
+  ready: function() {
+    this.style.color = 'blue';
+  }
+});
+
+Polymer('x-bar', {
+  ready: function() {
+    this.style.padding = '4px';
+    this.style.backgroundColor = 'orange';
+    this.super();
+  }
+});
diff --git a/test/html/element-import/import.html b/test/html/element-import/import.html
new file mode 100644
index 0000000000..3c9becc09b
--- /dev/null
+++ b/test/html/element-import/import.html
@@ -0,0 +1,46 @@
+<script src="elements.js"></script>
+
+<!-- preloaded external script -->
+<polymer-element name="x-foo">
+  <template>
+    Hello Light World
+  </template>
+</polymer-element>
+
+<!-- no script -->
+<polymer-element name="x-zot" extends="x-foo" noscript>
+  <template>
+    Hello Lighter World [<shadow></shadow>]
+  </template>
+</polymer-element>
+
+<!-- inline script -->
+<polymer-element name="x-baz" extends="x-zot">
+  <script>
+    Polymer('x-baz', {
+      ready: function() {
+        this.style.padding = '4px';
+        this.style.backgroundColor = 'tomato';
+        this.super();
+      }
+    });
+  </script>
+</polymer-element>
+
+<!-- inline script before polymer-element -->
+<script>
+  Polymer('x-qux', {
+    ready: function() {
+      this.style.padding = '4px';
+      this.style.backgroundColor = 'green';
+      this.super();
+    }
+  });
+</script>
+<polymer-element name="x-qux" extends="x-zot">
+</polymer-element>
+
+<!-- inline external script -->
+<polymer-element name="x-quux" extends="x-zot">
+  <script src="x-quux.js"></script>
+</polymer-element>
\ No newline at end of file
diff --git a/test/html/element-import/x-quux.js b/test/html/element-import/x-quux.js
new file mode 100644
index 0000000000..cad4883e7a
--- /dev/null
+++ b/test/html/element-import/x-quux.js
@@ -0,0 +1,6 @@
+Polymer('x-quux', {
+  ready: function() {
+    this.style.fontSize = '24px';
+    this.super();
+  }
+});
diff --git a/test/html/element-registration.html b/test/html/element-registration.html
index 523d35708e..98640209e1 100644
--- a/test/html/element-registration.html
+++ b/test/html/element-registration.html
@@ -40,13 +40,10 @@
 
   <!-- script embedded in declaration -->
   <!-- super script follows declaration -->
-  <polymer-element name="x-bar" extends="x-foo">
+  <polymer-element name="x-bar" extends="x-foo" noscript>
     <template>
       Hello Lighter World [<shadow></shadow>]
     </template>
-    <script>
-      Polymer('x-bar', {});
-    </script>
   </polymer-element>
 
   <!-- no script extends w/script -->

From 01d5adc9aa8036fb2f90dbcdc6b7453a82eba044 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Tue, 13 Aug 2013 14:54:59 -0700
Subject: [PATCH 11/15] update tests

---
 test/html/bind-object-repeat.html          |  8 +---
 test/html/prop-attr-reflection.html        |  4 +-
 test/html/template-distribute-dynamic.html | 45 ++++++++++------------
 test/html/unbind.html                      | 29 ++------------
 test/js/bindMDV.js                         | 13 ++++---
 5 files changed, 35 insertions(+), 64 deletions(-)

diff --git a/test/html/bind-object-repeat.html b/test/html/bind-object-repeat.html
index f083a1437f..a908a2d2ba 100644
--- a/test/html/bind-object-repeat.html
+++ b/test/html/bind-object-repeat.html
@@ -46,26 +46,22 @@
     <script>
       var assert = chai.assert;
       document.addEventListener('WebComponentsReady', function() {
-        dirtyCheck();
         var o = document.querySelector('x-bind-obj');
         var root = o.webkitShadowRoot;
         f = root.querySelector('x-foo');
         assert.equal(f.obj, o.testObj);
-        
         function checkXFoo(inXFoo) {
           var p = inXFoo.webkitShadowRoot.querySelector('p');
           assert.isDefined(inXFoo.obj.foo);
           assert.equal(p.innerHTML, 'obj.foo is ' + inXFoo.obj.foo);
         }
-        
-        setTimeout(function() {
+        Platform.flush();
+        Platform.endOfMicrotask(function() {
           checkXFoo(f);
-
           var d = root.querySelector('div');
           Array.prototype.forEach.call(d.querySelectorAll('x-foo'), function(x) {
             checkXFoo(x);
           });
-
           done();
         });
       });
diff --git a/test/html/prop-attr-reflection.html b/test/html/prop-attr-reflection.html
index eb0e3b61d2..f773e671e1 100644
--- a/test/html/prop-attr-reflection.html
+++ b/test/html/prop-attr-reflection.html
@@ -36,14 +36,14 @@
         var xfoo = document.querySelector('x-foo');
         xfoo.foo = 5;
         Platform.flush();
-        setTimeout(function() {
+        Platform.endOfMicrotask(function() {
           assert.equal(String(xfoo.foo), xfoo.getAttribute('foo'), 'attribute reflects property as string');
           xfoo.setAttribute('foo', '27');
           assert.equal(xfoo.foo, xfoo.getAttribute('foo'), 'property reflects attribute');
           //
           xfoo.baz = 'Hello';
           Platform.flush();
-          setTimeout(function() {
+          Platform.endOfMicrotask(function() {
             assert.equal(xfoo.baz, xfoo.getAttribute('baz'), 'attribute reflects property');
             //
             var xbar = document.querySelector('x-bar');
diff --git a/test/html/template-distribute-dynamic.html b/test/html/template-distribute-dynamic.html
index 4c79cf0cb0..3f1f2844b5 100644
--- a/test/html/template-distribute-dynamic.html
+++ b/test/html/template-distribute-dynamic.html
@@ -30,32 +30,29 @@
     </template>
     <script>
       Polymer('x-test', {
-        ready: function() {
-          setTimeout(function() {
-            this.list = [
-              {name: 'foo'},
-              {name: 'bar'}
-            ];
-            Platform.flush();
-            // tickle
+        enteredDocument: function() {
+          this.list = [
+            {name: 'foo'},
+            {name: 'bar'}
+          ];
+          Platform.flush();
+          Platform.endOfMicrotask(function() {
+            // tickle SD polyfill
             this.offsetHeight;
-            setTimeout(function() {
-              var children = this.$.echo.children;
+            var children = this.$.echo.children;
+            chai.assert.equal(children[0].localName, 'template',
+              'shadowDOM dynamic distribution via template');
+            chai.assert.equal(children[1].textContent, 'foo',
+              'shadowDOM dynamic distribution via template');
+            chai.assert.equal(children[2].textContent, 'bar',
+              'shadowDOM dynamic distribution via template');
 
-              chai.assert.equal(children[0].localName, 'template',
-                'shadowDOM dynamic distribution via template');
-              chai.assert.equal(children[1].textContent, 'foo',
-                'shadowDOM dynamic distribution via template');
-              chai.assert.equal(children[2].textContent, 'bar',
-                'shadowDOM dynamic distribution via template');
-
-              if (window.ShadowDOMPolyfill) {
-                var actualChildren = this.$.echo.impl.children;
-                chai.assert.equal(actualChildren.length, 4,
-                  'shadowDOMPolyfill distributes expected number of actual children.');
-              }
-              done();
-            }.bind(this));
+            if (window.ShadowDOMPolyfill) {
+              var actualChildren = this.$.echo.impl.children;
+              chai.assert.equal(actualChildren.length, 4,
+                'shadowDOMPolyfill distributes expected number of actual children.');
+            }
+            done();
           }.bind(this));
         }
       });
diff --git a/test/html/unbind.html b/test/html/unbind.html
index 1ef4f27f01..3870e9e734 100644
--- a/test/html/unbind.html
+++ b/test/html/unbind.html
@@ -33,7 +33,6 @@
   <script>
      function testAsync(tests, delay, args) {
        if (tests.length) {
-         // Ensure IE goes
          CustomElements.takeRecords();
          setTimeout(function() {
            var lastArgs = tests.shift().apply(null, args || []);
@@ -95,31 +94,9 @@
           chai.assert.isTrue(node._unbound, 
             'element is unbound when manually removed is called');
         }
-        // TODO(sorvell): make test work in ShadowDOM Polyfill then uncomment
-        /*,
-        function() {
-          var o = document.createElement('x-test');
-          document.body.appendChild(o);
-          o.bar = 'testbar';
-          var fragment = Polymer.parseAndBindHTML('<div>' +
-            '<x-test bar="{{bar}}"></x-test></div>', o);
-          o.webkitShadowRoot.appendChild(fragment);
-          return [o.webkitShadowRoot.lastChild];
-        },
-        function(node) {
-          var xTestNode = node.firstChild;
-          chai.assert.ok(!xTestNode._unbound, 
-            'element is bound when manually inserted');
-          Platform.flush();
-          
-          chai.assert.isTrue(xTestNode.isBarValid(), 'binding is active');
-          return;
-          Polymer.unbindNodeTree(node);
-          node.textContent = '';
-          chai.assert.isTrue(xTestNode._unbound, 
-            'element is unbound when parent calls unbindNodeTree');
-        }*/
-      ], 0);
+      // TODO(sorvell): In IE, the unbind time is indeterminate, so wait an
+      // extra beat.
+      ], 50);
     });
   </script>
   </body>
diff --git a/test/js/bindMDV.js b/test/js/bindMDV.js
index d3b0fd7164..2902cfd930 100644
--- a/test/js/bindMDV.js
+++ b/test/js/bindMDV.js
@@ -23,18 +23,17 @@ suite('bindMDV', function() {
     
     test.bar = 5;
     Platform.flush();
-    setTimeout(function() {
+    Platform.endOfMicrotask(function() {
       assert.equal(a.getAttribute('foo'), 5);
-      //
       test.bar = 8;
       Platform.flush();
-      setTimeout(function() {
+      Platform.endOfMicrotask(function() {
         assert.equal(a.getAttribute('foo'), 8);
         done();
       });
     });
   });
-    
+  
   test('bindModel bind input', function(done) {
     var test = document.createElement('div');
     var fragment = parseAndBindHTML('<input value="{{bar}}" />', test);
@@ -43,14 +42,16 @@ suite('bindMDV', function() {
     
     test.bar = 'hello';
     Platform.flush();
-    setTimeout(function() {
+    Platform.endOfMicrotask(function() {
       assert.equal(a.value, 'hello');
       done();
     });
   });
+  
 });
 
+
 htmlSuite('unbind', function() {
   htmlTest('html/template-distribute-dynamic.html');
   htmlTest('html/unbind.html');
-});
\ No newline at end of file
+});

From 3ef3643ab633e80175cacdf24ff3e8357503ae7a Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 13 Aug 2013 15:37:30 -0700
Subject: [PATCH 12/15] fix audit for repo renames

---
 gruntfile.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index da3c7cb69b..246a7433ca 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -140,10 +140,10 @@ module.exports = function(grunt) {
             '../CustomElements',
             '../PointerEvents',
             '../PointerGestures',
-            '../PolymerExpressions',
-            '../ObserveJS',
-            '../Node-bind',
-            '../Template-instantiation'
+            '../polymer-expressions',
+            '../observe-js',
+            '../NodeBind',
+            '../TemplateInstances'
           ]
         },
         dest: 'build.log',

From ffae850011305cd71f6cd928eaa1baa35fa8ed12 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Tue, 13 Aug 2013 16:11:31 -0700
Subject: [PATCH 13/15] update test

---
 test/html/element-import.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/html/element-import.html b/test/html/element-import.html
index f7c67d1e59..656cdc1c60 100644
--- a/test/html/element-import.html
+++ b/test/html/element-import.html
@@ -44,8 +44,7 @@
       assert.equal(getComputedStyle(bar).backgroundColor, 'rgb(255, 165, 0)');
       //
       var zot = document.querySelector('x-zot');
-      //assert.equal(getComputedStyle(zot).color, 'rgb(0, 0, 255)');
-      /*
+      assert.equal(getComputedStyle(zot).color, 'rgb(0, 0, 255)');
       //
       var baz = document.querySelector('x-baz');
       assert.equal(getComputedStyle(baz).color, 'rgb(0, 0, 255)');
@@ -58,7 +57,6 @@
       var quux = document.querySelector('x-quux');
       assert.equal(getComputedStyle(quux).color, 'rgb(0, 0, 255)');
       assert.equal(getComputedStyle(quux).fontSize, '24px');
-      */
       done();
     });
   </script>

From 0565e22183352892f5182ffaa9e6bb270c8896e2 Mon Sep 17 00:00:00 2001
From: Scott Miles <sjmiles@google.com>
Date: Tue, 13 Aug 2013 18:15:04 -0700
Subject: [PATCH 14/15] move bookkeeping code below main code in
 polymer-element, factor prototype generation out of polymer-element and into
 it's own 'api' module

---
 gruntfile.js                       |   1 +
 polymer.js                         |   1 +
 src/declaration/polymer-element.js | 189 +++++++++--------------------
 src/declaration/prototype.js       | 100 +++++++++++++++
 4 files changed, 162 insertions(+), 129 deletions(-)
 create mode 100644 src/declaration/prototype.js

diff --git a/gruntfile.js b/gruntfile.js
index 246a7433ca..ec1a24ec5e 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -38,6 +38,7 @@ module.exports = function(grunt) {
     "declaration/events.js",
     "declaration/properties.js",
     "declaration/attributes.js",
+    "declaration/prototype.js",
     "declaration/polymer-element.js",
     "deprecated.js"
   ].map(function(n) {
diff --git a/polymer.js b/polymer.js
index 50045ba858..42bb26986c 100644
--- a/polymer.js
+++ b/polymer.js
@@ -31,6 +31,7 @@ var modules = [
   "declaration/events.js",
   "declaration/properties.js",
   "declaration/attributes.js",
+  "declaration/prototype.js",
   "declaration/polymer-element.js",
   "deprecated.js"
 ].map(function(n) {
diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 185b4a6eea..9989430ec1 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -7,21 +7,11 @@
 
   // imports
 
-  var extend = Polymer.extend;
+  var extend = scope.extend;
   var apis = scope.api.declaration;
 
   // imperative implementation: Polymer()
 
-  // maps tag names to prototypes
-  var prototypesByName = {};
-
-  function getRegisteredPrototype(name) {
-    return prototypesByName[name];
-  }
-
-  // elements waiting for prototype, by name
-  var waitPrototype = {};
-
   // specify an 'own' prototype for tag `name`
   function element(name, prototype) {
     //console.log('registering [' + name + ']');
@@ -31,71 +21,9 @@
     notifyPrototype(name);
   }
 
-  function notifyPrototype(name) {
-    if (waitPrototype[name]) {
-      waitPrototype[name].registerWhenReady();
-      delete waitPrototype[name];
-    }
-  }
-
-  // elements waiting for super, by name
-  var waitSuper = {};
-
-  function notifySuper(name) {
-    registered[name] = true;
-    var waiting = waitSuper[name];
-    if (waiting) {
-      waiting.forEach(function(w) {
-        w.registerWhenReady();
-      });
-      delete waitSuper[name];
-    }
-  }
-
-  // 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));
-  }
-
-  // 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 desugaring.
-  function ensurePrototypeTraversal(prototype) {
-    if (!Object.__proto__) {
-      var ancestor = Object.getPrototypeOf(prototype);
-      prototype.__proto__ = ancestor;
-      if (scope.isBase(ancestor)) {
-        ancestor.__proto__ = Object.getPrototypeOf(ancestor);
-      }
-    }
-  }
-
-  function whenImportsLoaded(doThis) {
-    if (window.HTMLImports && !HTMLImports.readyTime) {
-      addEventListener('HTMLImportsLoaded', doThis);
-    } else {
-      doThis();
-    }
-  }
-
   // declarative implementation: <polymer-element>
 
-  var prototype = generatePrototype();
-
-  extend(prototype, {
-    // TODO(sjmiles): temporary BC
-    readyCallback: function() {
-      this.createdCallback();
-    },
+  var prototype = extend(Object.create(HTMLElement.prototype), {
     createdCallback: function() {
       // fetch the element name
       this.name = this.getAttribute('name');
@@ -113,7 +41,6 @@
           var script = document.createElement('script');
           script.textContent = 'Polymer(\'' + name + '\');';
           this.appendChild(script);
-          
         }
         return;
       }
@@ -127,7 +54,7 @@
           return;
         }
       }
-      // TODO(sjmiles): HTMLImports polyfill awareness
+      // 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
@@ -152,7 +79,6 @@
       // Potentially remove when spec bug is addressed.
       // https://www.w3.org/Bugs/Public/show_bug.cgi?id=21407
       this.addResolvePathApi();
-      ensurePrototypeTraversal(this.prototype);
       // declarative features
       this.desugar();
       // under ShadowDOMPolyfill, transforms to approximate missing CSS features
@@ -183,57 +109,6 @@
       // cache the list of custom prototype names for faster reflection
       this.cacheProperties();
     },
-    // prototype marshaling
-    // build prototype combining extendee, Polymer base, and named api
-    generateCustomPrototype: function (name, extnds) {
-      // basal prototype
-      var prototype = this.generateBasePrototype(extnds);
-      // mixin registered custom api
-      return this.addNamedApi(prototype, name);
-    },
-    // build prototype combining extendee, Polymer base, and named api
-    generateBasePrototype: function(extnds) {
-      // create a prototype based on tag-name extension
-      var prototype = generatePrototype(extnds);
-      // insert base api in inheritance chain (if needed)
-      return this.ensureBaseApi(prototype);
-    },
-    // install Polymer instance api into prototype chain, as needed 
-    ensureBaseApi: function(prototype) { 
-      if (!prototype.PolymerBase) {
-        Object.keys(scope.api.instance).forEach(function(n) {
-          extend(prototype, scope.api.instance[n]);
-        });
-        prototype = Object.create(prototype);
-      }
-      // inherit publishing meta-data
-      this.inheritAttributesObjects(prototype);
-      // inherit event delegates
-      this.inheritDelegates(prototype);
-      // return buffed-up prototype
-      return prototype;
-    },
-    // mix api registered to 'name' into 'prototype' 
-    addNamedApi: function(prototype, name) { 
-      // combine custom api into prototype
-      return extend(prototype, getRegisteredPrototype(name));
-    },
-    // make a fresh object that inherits from a prototype object
-    inheritObject: function(prototype, name) {
-      // copy inherited properties onto a new object
-      prototype[name] = extend({}, Object.getPrototypeOf(prototype)[name]);
-    },
-    // register 'prototype' to custom element 'name', store constructor 
-    registerPrototype: function(name) { 
-      // register the custom type
-      this.ctor = document.register(name, {
-        prototype: this.prototype
-      });
-      // constructor shenanigans
-      this.prototype.constructor = this.ctor;
-      // register the prototype with HTMLElement for name lookup
-      HTMLElement.register(name, this.prototype);
-    },
     // if a named constructor is requested in element, map a reference
     // to the constructor to the given symbol
     publishConstructor: function() {
@@ -244,6 +119,8 @@
     }
   });
 
+  // semi-pluggable APIs 
+  // TODO(sjmiles): should be fully pluggable
   Object.keys(apis).forEach(function(n) {
     extend(prototype, apis[n]);
   });
@@ -252,7 +129,61 @@
 
   document.register('polymer-element', {prototype: prototype});
 
-  // namespace shenanigans so we can expose our scope on the registration function
+  // utility and bookkeeping
+  
+  // maps tag names to prototypes
+  var prototypesByName = {};
+
+  function getRegisteredPrototype(name) {
+    return prototypesByName[name];
+  }
+
+  // elements waiting for prototype, by name
+  var waitPrototype = {};
+
+  function notifyPrototype(name) {
+    if (waitPrototype[name]) {
+      waitPrototype[name].registerWhenReady();
+      delete waitPrototype[name];
+    }
+  }
+
+  // elements waiting for super, by name
+  var waitSuper = {};
+
+  function notifySuper(name) {
+    registered[name] = true;
+    var waiting = waitSuper[name];
+    if (waiting) {
+      waiting.forEach(function(w) {
+        w.registerWhenReady();
+      });
+      delete waitSuper[name];
+    }
+  }
+
+  // track document.register'ed tag names
+
+  var registered = {};
+
+  function isRegistered(name) {
+    return registered[name];
+  }
+
+  function whenImportsLoaded(doThis) {
+    if (window.HTMLImports && !HTMLImports.readyTime) {
+      addEventListener('HTMLImportsLoaded', doThis);
+    } else {
+      doThis();
+    }
+  }
+
+  // exports
+  
+  scope.getRegisteredPrototype = getRegisteredPrototype;
+  
+  // 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()`
diff --git a/src/declaration/prototype.js b/src/declaration/prototype.js
new file mode 100644
index 0000000000..0b7ac527b2
--- /dev/null
+++ b/src/declaration/prototype.js
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013 The Polymer Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+(function(scope) {
+
+  // imports
+  
+  var api = scope.api;
+  var isBase = scope.isBase;
+  var extend = scope.extend;
+  
+  // returns a prototype that chains to <tag> or HTMLElement
+  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 
+  // available during desugaring.
+  function ensurePrototypeTraversal(prototype) {
+    if (!Object.__proto__) {
+      var ancestor = Object.getPrototypeOf(prototype);
+      prototype.__proto__ = ancestor;
+      if (isBase(ancestor)) {
+        ancestor.__proto__ = Object.getPrototypeOf(ancestor);
+      }
+    }
+  }
+
+  // declarative implementation: <polymer-element>
+
+  var prototype = generatePrototype();
+  
+  // prototype api
+
+  var prototype = {
+    // prototype marshaling
+    // build prototype combining extendee, Polymer base, and named api
+    generateCustomPrototype: function (name, extnds) {
+      // basal prototype
+      var prototype = this.generateBasePrototype(extnds);
+      // mixin registered custom api
+      this.addNamedApi(prototype, name);
+      // x-platform fixups
+      ensurePrototypeTraversal(prototype);
+      return prototype;
+    },
+    // build prototype combining extendee, Polymer base, and named api
+    generateBasePrototype: function(extnds) {
+      // create a prototype based on tag-name extension
+      var prototype = generatePrototype(extnds);
+      // insert base api in inheritance chain (if needed)
+      return this.ensureBaseApi(prototype);
+    },
+    // install Polymer instance api into prototype chain, as needed 
+    ensureBaseApi: function(prototype) { 
+      if (!prototype.PolymerBase) {
+        Object.keys(api.instance).forEach(function(n) {
+          extend(prototype, api.instance[n]);
+        });
+        prototype = Object.create(prototype);
+      }
+      // inherit publishing meta-data
+      this.inheritAttributesObjects(prototype);
+      // inherit event delegates
+      this.inheritDelegates(prototype);
+      // return buffed-up prototype
+      return prototype;
+    },
+    // mix api registered to 'name' into 'prototype' 
+    addNamedApi: function(prototype, name) { 
+      // combine custom api into prototype
+      return extend(prototype, scope.getRegisteredPrototype(name));
+    },
+    // make a fresh object that inherits from a prototype object
+    inheritObject: function(prototype, name) {
+      // copy inherited properties onto a new object
+      prototype[name] = extend({}, Object.getPrototypeOf(prototype)[name]);
+    },
+    // register 'prototype' to custom element 'name', store constructor 
+    registerPrototype: function(name) { 
+      // register the custom type
+      this.ctor = document.register(name, {
+        prototype: this.prototype
+      });
+      // constructor shenanigans
+      this.prototype.constructor = this.ctor;
+      // register the prototype with HTMLElement for name lookup
+      HTMLElement.register(name, this.prototype);
+    }
+  };
+  
+  // exports
+
+  api.declaration.prototype = prototype;
+  
+})(Polymer);

From 38ce9b4223bfb5afaa387ca62c5d64bbaf03c2e6 Mon Sep 17 00:00:00 2001
From: Steve Orvell <steve@orvellia.com>
Date: Wed, 14 Aug 2013 11:44:43 -0700
Subject: [PATCH 15/15] noscript should now work better when used with
 CustomElements polyfill.

---
 src/declaration/polymer-element.js | 16 +++++++++++++---
 test/js/register.js                |  6 ++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index 9989430ec1..fadc396efc 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -38,9 +38,19 @@
         waitPrototype[name] = this;
         // if explicitly marked as 'noscript'
         if (this.hasAttribute('noscript')) {
-          var script = document.createElement('script');
-          script.textContent = 'Polymer(\'' + name + '\');';
-          this.appendChild(script);
+          // TODO(sorvell): CustomElements polyfill awareness:
+          // noscript elements should upgrade in logical order
+          // script injection ensures this under native custom elements;
+          // under imports + ce polyfill, scripts run before upgrades
+          // dependencies should be ready at upgrade time so register
+          // prototype at this time.
+          if (window.CustomElements && !CustomElements.useNative) {
+            element(name);
+          } else {
+            var script = document.createElement('script');
+            script.textContent = 'Polymer(\'' + name + '\');';
+            this.appendChild(script);
+          }
         }
         return;
       }
diff --git a/test/js/register.js b/test/js/register.js
index 00ea17f2a4..6bc8c217e9 100644
--- a/test/js/register.js
+++ b/test/js/register.js
@@ -46,10 +46,8 @@ htmlSuite('element callbacks', function() {
   htmlTest('html/callbacks.html');
 });
 
-htmlSuite('element script', function() {
-  htmlTest('html/element-script.html');
-});
-
 htmlSuite('element registration', function() {
+  htmlTest('html/element-script.html');
   htmlTest('html/element-registration.html');
+  htmlTest('html/element-import.html');
 });