Merge pull request #232 from chrisbu/polymer-register-fixes

Fixes for some of the workbench samples
Polymer · Aug 12, 2013 · 51e386e · 51e386e
2 parents 60247f5 + 2e95d97
commit 51e386e
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 39 deletions.
diff --git 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>

diff --git 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
@@ -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
@@ -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
@@ -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/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
@@ -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>
+</polymer-element>
diff --git 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
@@ -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>
diff --git 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
@@ -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>