Merge pull request #81 from PolymerLabs/remove-v0

Remove v0
Polymer · Aug 24, 2016 · 24881c4 · 24881c4
2 parents 2b57749 + 242bd7a
commit 24881c4
Show file tree

Hide file tree

Showing 43 changed files with 266 additions and 454 deletions.
diff --git a/src/attributes/attribute-to-property.html b/src/attributes/attribute-to-property.html
@@ -30,21 +30,6 @@
       }
     }
 
-    // temporary code for simulating CE v1 attribute callbacks
-    simulateV1AttributeCallbacks(inst) {
-      if (!window.customElements) {
-        var attrs = inst.constructor.observedAttributes;
-        if (attrs) {
-          for (var i=0; i<attrs.length; i++) {
-            var attr = attrs[i];
-            if (inst.hasAttribute(attr)) {
-              inst.attributeChangedCallback(attr, null, inst.getAttribute(attr));
-            }
-          }
-        }
-      }
-    }
-
     /**
      * Converts a string to a typed value.
      *

diff --git a/src/compat/custom-style-container.html b/src/compat/custom-style-container.html
@@ -17,12 +17,8 @@
 
     constructor() {
       super();
-      this.createdCallback();
-    }
-
-    createdCallback() {
       if (!this._acquireStyle()) {
-        this._observeContent();  
+        this._observeContent();
       }
       // TODO(sorvell): initialize elements in imports if necessary
       // (first impl of V1 native custom elements requires this)
@@ -75,7 +71,7 @@
 
     _transform(style) {
       // BREAKME(kschaaf): for short-term bc, but intend to break
-      style.textContent = 
+      style.textContent =
         Polymer.CompatStyleUtil.normalizeCSSTextForBC(style.textContent);
       Polymer.StyleLib.transformForDocument(style);
       enqueueDocumentValidation();
@@ -104,13 +100,7 @@
     documentValidationScheduled = false;
   }
 
-  var name = 'custom-style-container';
-
-  if (window.customElements) {
-    window.customElements.define(name, CustomStyle);
-  } else {
-    CustomStyle = document.registerElement(name, CustomStyle);
-  }
+  window.customElements.define('custom-style-container', CustomStyle);
 
 }());
 </script>
diff --git a/src/compat/custom-style.html b/src/compat/custom-style.html
@@ -16,10 +16,6 @@
 
     constructor() {
       super();
-      this.createdCallback();
-    }
-
-    createdCallback() {
       var e = this.__appliedElement = (this.__appliedElement || this);
       this._initialize(e);
       // TODO(sorvell): initialize elements in imports if necessary
@@ -84,14 +80,7 @@
     documentValidationScheduled = false;
   }
 
-  CustomStyle.extends = 'style';
-  var name = 'custom-style';
-
-  if (window.customElements) {
-    customElements.define(name, CustomStyle);
-  } else {
-    CustomStyle = document.registerElement(name, CustomStyle);
-  }
+  customElements.define('custom-style', CustomStyle, {extends: 'style'});
 
 })();
 </script>
diff --git a/src/compat/dom-module.html b/src/compat/dom-module.html
@@ -31,10 +31,6 @@
       this.register();
     }
 
-    createdCallback() {
-      this.register();
-    }
-
     // BREAKME(dfreedm)
     _styleOutsideTemplateCheck() {
       if (this.querySelector('style')) {
@@ -100,11 +96,7 @@
   // NOTE: Safari can't deal with an ES6 style function named `import`
   DomModule.prototype.import = DomModule.prototype.__import;
 
-  if (window.customElements) {
-    customElements.define('dom-module', DomModule);
-  } else {
-    DomModule = document.registerElement('dom-module', DomModule);
-  }
+  customElements.define('dom-module', DomModule);
 
   // NOTE: HTMLImports polyfill does not
   // block scripts on upgrading elements. However, we want to ensure that

diff --git a/src/compat/polymer-fn.html b/src/compat/polymer-fn.html
@@ -33,12 +33,8 @@
       if (klass.extends) {
         options.extends = klass.extends;
       }
-      if (window.customElements) {
-        customElements.define(klass.is, klass, options);
-        return klass;
-      } else {
-        return document.registerElement(klass.prototype.is, klass);
-      }
+      customElements.define(klass.is, klass, options);
+      return klass;
     };
 
     if (userPolymer) {
@@ -48,7 +44,7 @@
     }
 
     // TODO(sorvel): ad hoc settings...
-    Polymer.shadowDomV0 = Polymer.shadowDomV0 || 
+    Polymer.shadowDomV0 = Polymer.shadowDomV0 ||
       (location.search.indexOf('shadowDomV0=true') >= 0);
 
   })();

diff --git a/src/elements/compat-element.html b/src/elements/compat-element.html
@@ -269,9 +269,7 @@
         var list = [];
         var c$ = this.childNodes;
         for (var i=0, l=c$.length, c; (i<l) && (c=c$[i]); i++) {
-          // BREAKME(sorvell): remove when V0 ShadowDom support is removed.
-          var d$ = (c.localName === 'content') ? c.getDistributedNodes() :
-            ((c.localName === 'slot') ? c.assignedNodes({flatten: true}) : null);
+          var d$ = (c.localName === 'slot') ? c.assignedNodes({flatten: true}) : null;
           if (d$) {
             for (var j=0; j < d$.length; j++) {
               list.push(d$[j]);

diff --git a/src/elements/element.html b/src/elements/element.html
@@ -217,9 +217,8 @@
       ready() {
         if (!this.root) {
           if (this._template) {
-            // BREAKME(sorvell): remove v0 support when we can...
-            this.root = Polymer.shadowDomV0 ? this.createShadowRoot() :
-              this.attachShadow({mode: 'open'});
+            // BREAKME(sorvell): v0 support removed
+            this.root = this.attachShadow({mode: 'open'});
           } else {
             this.root = this;
           }

diff --git a/src/templatizer/dom-bind.html b/src/templatizer/dom-bind.html
@@ -23,18 +23,10 @@
     class DomBind extends data.extendWithAPI(HTMLElement) {
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         this.render();
       }
 
       disconnectedCallback() {
-        this.detachedCallback();
-      }
-
-      detachedCallback() {
         this._removeChildren();
       }
 
@@ -74,11 +66,7 @@
 
     }
 
-    if (window.customElements) {
-      customElements.define('dom-bind', DomBind);
-    } else {
-      DomBind = document.registerElement('dom-bind', DomBind);
-    }
+    customElements.define('dom-bind', DomBind);
 
   })();
 

diff --git a/test/runner.html b/test/runner.html
@@ -63,8 +63,7 @@
       }, []);
     }
 
-    // suites = combinations(suites, [['', 'shadowDomV0=true'], ['wc-ce=v0', 'wc-ce=v0&wc-register', 'wc-ce=v1']]);
-    suites = combinations(suites, [['wc-ce=v1&wc-register=true']]);
+    suites = combinations(suites, [['wc-ce=v1&wc-register=true'], ['forceShadyDom=true', '']]);
     console.log('Testing suites:\n\t' + suites.join('\n\t'));
 
     WCT.loadSuites(suites);

diff --git a/test/smoke/attributes-polymer.html b/test/smoke/attributes-polymer.html
@@ -16,19 +16,19 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../../polymer.html">
-  
+
   <script>
   (function() {
 
     'use strict';
-    
+
     var attributes = new Polymer.AttributeToProperty();
 
     class XBase extends HTMLElement {
-
-      createdCallback() {
+
+      constructor() {
+        super();
         this.textContent = 'hello world';
-        attributes.simulateV1AttributeCallbacks(this);
         // test attributeChanged
         this.setAttribute('attr', 'attr');
         console.log('attributeToProperty: pull is', this.pull);
@@ -44,17 +44,17 @@
     }
 
     XBase.observedAttributes = {
-      pull: true, 
+      pull: true,
       attr: true
     };
 
-    document.registerElement('x-base', XBase);
+    customElements.define('x-base', XBase);
 
     // *********************
 
     // working up to this...
     Polymer({
-      
+
       is: 'x-polymer',
 
       hostAttributes: {
@@ -64,7 +64,7 @@
       properties: {
         pull: {type: String}
       },
-      
+
       ready: function() {
         this.textContent = this.localName;
         console.log('attribute set to property: pull is', this.pull);

diff --git a/test/smoke/attributes.html b/test/smoke/attributes.html
@@ -16,20 +16,19 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../../src/attributes/attribute-to-property.html">
-  
+
   <script>
   (function() {
 
     'use strict';
 
     var attributes = new Polymer.AttributeToProperty();
-    
+
     class XBase extends HTMLElement {
-
-      createdCallback() {
-        this.textContent = 'hello world';
-        attributes.simulateV1AttributeCallbacks(this);
-        // test attributeChanged
+
+      constructor() {
+        super();
+        this.textContent = 'hello world';        // test attributeChanged
         this.setAttribute('attr', 'attr');
         console.log('attributeToProperty: pull is', this.pull);
       }
@@ -44,11 +43,11 @@
     }
 
     XBase.observedAttributes = {
-      pull: true, 
+      pull: true,
       attr: true
     };
 
-    document.registerElement('x-base', XBase);
+    customElements.define('x-base', XBase);
 
   })();
   </script>

diff --git a/test/smoke/bindings.html b/test/smoke/bindings.html
@@ -64,10 +64,11 @@
 
     class XBindings extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         var dom = document.importNode(template.content, true);
         propertyEffects.setupBindings(this, dom, notes);
-        this.createShadowRoot().appendChild(dom);
+        this.attachShadow({mode:'open'}).appendChild(dom);
       }
 
       concat(a, b) {
@@ -78,7 +79,7 @@
 
     propertyEffects.bindTemplate(XBindings, template);
 
-    document.registerElement('x-bindings', XBindings);
+    customElements.define('x-bindings', XBindings);
 
     ///////////////
 
@@ -87,11 +88,11 @@
 
     class XClient extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         var dom = document.importNode(clientTemplate.content, true);
         propertyEffects.setupBindings(this, dom, clientNotes);
-        this.createShadowRoot().appendChild(dom);
-        //this.attachShadow({mode: 'open'}).appendChild(dom);
+        this.attachShadow({mode: 'open'}).appendChild(dom);
       }
 
     }
@@ -100,7 +101,7 @@
     propertyEffects.createNotifyingProperty(XClient, 'prop');
     propertyEffects.bindTemplate(XClient, clientTemplate);
 
-    document.registerElement('x-client', XClient);
+    customElements.define('x-client', XClient);
 
   })();
   </script>