Fixes #4437. Ensure _registered is called 1x for each element class…

… using `LegacyElementMixin`. Ensure that a behaviors’s `registered` method is called for any extending class.
Polymer · Mar 16, 2017 · de09d73 · de09d73
1 parent 04c5053
commit de09d73
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/lib/legacy/class.html b/lib/legacy/class.html
@@ -131,8 +131,6 @@
 
     function GenerateClassFromInfo(info, Base) {
 
-      let registered = false;
-
       class PolymerGenerated extends Base {
 
         static get properties() {
@@ -163,13 +161,9 @@
         }
 
         _registered() {
-          if (!registered) {
-            super._registered();
-            // call `registered` only if it was not called for *this* constructor
-            registered = true;
-            if (info.registered) {
-              info.registered.call(Object.getPrototypeOf(this));
-            }
+          super._registered();
+          if (info.registered) {
+            info.registered.call(Object.getPrototypeOf(this));
           }
         }
 

diff --git a/lib/legacy/legacy-element-mixin.html b/lib/legacy/legacy-element-mixin.html
@@ -105,12 +105,17 @@
 
       /**
        * Overrides the default `Polymer.PropertyEffects` implementation to
-       * add support for one-time `registration` callback.
+       * add support for class initialization via the `_registered` callback.
+       * This is called only when the first instance of the element is created.
        *
        * @override
        */
       _initializeProperties() {
-        this._registered();
+        let proto = Object.getPrototypeOf(this);
+        if (!proto.hasOwnProperty('__hasRegisterFinished')) {
+          proto.__hasRegisterFinished = true;
+          this._registered();
+        }
         super._initializeProperties();
       }
 

diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
@@ -329,12 +329,18 @@
       BehaviorRegistered.prototype.registeredCount = 0;
 
       customElements.define(BehaviorRegistered.is, BehaviorRegistered);
+
+      class BehaviorRegisteredExt extends BehaviorRegistered {
+        static get is() { return 'behavior-registered-ext'}
+      }
+
+      BehaviorRegisteredExt.prototype.registeredCount = 0;
+
+      customElements.define(BehaviorRegisteredExt.is, BehaviorRegisteredExt);
     });
     </script>
   </dom-module>
 
-  </script>
-
   <test-fixture id="single">
     <template>
       <single-behavior></single-behavior>
@@ -364,6 +370,12 @@
       <behavior-registered></behavior-registered>
     </template>
   </test-fixture>
+
+  <test-fixture id="registered-ext">
+    <template>
+      <behavior-registered-ext></behavior-registered-ext>
+    </template>
+  </test-fixture>
 <script>
 
 suite('single behavior element', function() {
@@ -421,6 +433,14 @@
     assert.deepEqual(el.registeredProps, [true, true, true]);
   });
 
+  test('extending element with behaviors with registered properly registers', function() {
+    var el = fixture('registered-ext');
+    assert.equal(el.registeredCount, 4);
+    assert.equal(el.registeredBehaviors.length, 3);
+    assert.equal(el.registeredBehaviors, el.behaviors);
+    assert.deepEqual(el.registeredProps, [true, true, true]);
+  });
+
 });
 
 suite('behavior lifecycle', function() {