Merge pull request #4571 from Polymer/4550-remove-disable-upgrade

Removes the `disable-upgrade` feature from Polymer 2.0.
Polymer · Apr 28, 2017 · a284d77 · a284d77
2 parents c46c577 + 972b2ba
commit a284d77
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 281 deletions.
diff --git a/lib/mixins/element-mixin.html b/lib/mixins/element-mixin.html
@@ -124,8 +124,6 @@
 
     let caseMap = Polymer.CaseMap;
 
-    const DISABLED = 'disable-upgrade';
-
     /**
      * Returns the `properties` object specifically on `klass`. Use for:
      * (1) super chain mixes togther to make `propertiesForClass` which is
@@ -453,8 +451,6 @@
       proto._bindTemplate(template);
     }
 
-    function flushPropertiesStub() {}
-
     /**
      * @polymerMixinClass
      * @unrestricted
@@ -472,7 +468,7 @@
        */
       static get observedAttributes() {
         if (!this.hasOwnProperty(JSCompiler_renameProperty('__observedAttributes', this))) {
-          let list = [DISABLED];
+          let list = [];
           let properties = propertiesForClass(this);
           for (let prop in properties) {
             list.push(Polymer.CaseMap.camelToDashCase(prop));
@@ -720,19 +716,7 @@
        * @override
        */
       attributeChangedCallback(name, old, value) {
-        // process `disable-upgrade` specially:
-        // First we see `disable-upgrade` added and disable `_flushProperties`,
-        // then when it's removed, restore regular flushing and flush.
-        // This should only be allowed before "readying".
-        if (name === DISABLED && !this.__dataInitialized) {
-          if (value !== null) {
-            this.__flushProperties = this._flushProperties;
-            this._flushProperties = flushPropertiesStub;
-          } else {
-            this._flushProperties = this.__flushProperties;
-            this._flushProperties();
-          }
-        } else if (old !== value) {
+        if (old !== value) {
           let property = caseMap.dashToCamelCase(name);
           let type = propertiesForClass(this.constructor)[property].type;
           if (!this._hasReadOnlyEffect(property)) {

diff --git a/lib/mixins/template-stamp.html b/lib/mixins/template-stamp.html
@@ -118,11 +118,6 @@
      */
     class TemplateStamp extends superClass {
 
-      _initializeProperties() {
-        super._initializeProperties();
-        this.$ = null;
-      }
-
       /**
        * Scans a template to produce template metadata.
        *

diff --git a/test/runner.html b/test/runner.html
@@ -71,8 +71,7 @@
       'unit/logging.html',
       'unit/mixin-utils.html',
       'unit/mixin-behaviors.html',
-      'unit/render-status.html',
-      'unit/disable-upgrade.html'
+      'unit/render-status.html'
     ];
 
     // http://eddmann.com/posts/cartesian-product-in-javascript/

diff --git a/test/smoke/disable-upgrade.html b/test/smoke/disable-upgrade.html
diff --git a/test/unit/disable-upgrade.html b/test/unit/disable-upgrade.html