GreenPolyProducts/polymer
5
0
Fork 0
mirror of https://github.com/Polymer/polymer.git synced 2026-08-19 01:14:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure registered is always called on element prototype

Browse Source 
Previously, it could be called on a superclass' prototype and not the element's prototype.
This commit is contained in:
Steven Orvell
2018-11-13 15:32:36 -08:00
parent 44e4828796
commit 29d514f70c
2 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/legacy/class.html
+38 -26
View File
@@ -218,13 +218,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
behaviors not active on the superclass. In order to call through to the
entire list of lifecycle methods, it's important to call `super`.
The element's `properties`, `observers`, and the `_registered` method
are controlled via the finalization mechanism provided by `PropertiesMixin`.
`Properties` and `observers` are collected by manually traversing the prototype
chain and merging. The `_registered` method is called via
`LegacyElementMixin._finalizeClass`.
The element's `properties` and `observers` are controlled via the finalization
mechanism provided by `PropertiesMixin`. `Properties` and `observers` are
collected by manually traversing the prototype chain and merging.
To limit changes, the `_registered` method is called via `_initializeProperties`
and not `_finalizeClass`.
*/
/**
* @param {!PolymerInit} info Polymer info object
@@ -290,27 +289,37 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
// Called on element prototype
_registered() {
/* NOTE: `beforeRegister` is called here for bc, but the behavior
is different than in 1.x. In 1.0, the method was called *after*
mixing prototypes together but *before* processing of meta-objects.
However, dynamic effects can still be set here and can be done either
in `beforeRegister` or `registered`. It is no longer possible to set
`is` in `beforeRegister` as you could in 1.x.
is different than in 1.x. In 1.0, the method was called *after*
mixing prototypes together but *before* processing of meta-objects.
However, dynamic effects can still be set here and can be done either
in `beforeRegister` or `registered`. It is no longer possible to set
`is` in `beforeRegister` as you could in 1.x.
*/
const proto = this;
// copy properties lazily if we're optimizing
if (Polymer.legacyOptimizations) {
copyPropertiesToProto(proto);
}
let list = lifecycle.beforeRegister;
if (list) {
for (let i=0; i < list.length; i++) {
list[i].call(proto);
// only proceed if the generated class' prototype has not been registered.
const generatedProto = PolymerGenerated.prototype;
if (!generatedProto.hasOwnProperty('__hasRegisterFinished')) {
generatedProto.__hasRegisterFinished = true;
// ensure superclass is registered first.
super._registered();
// copy properties onto the generated class lazily if we're optimizing,
if (Polymer.legacyOptimizations) {
copyPropertiesToProto(generatedProto);
}
}
list = lifecycle.registered;
if (list) {
for (let i=0; i < list.length; i++) {
list[i].call(proto);
// make sure legacy lifecycle is called on the *element*'s prototype
// and not the generated class prototype; if the element has been
// extended, these are *not* the same.
const proto = Object.getPrototypeOf(this);
let list = lifecycle.beforeRegister;
if (list) {
for (let i=0; i < list.length; i++) {
list[i].call(proto);
}
}
list = lifecycle.registered;
if (list) {
for (let i=0; i < list.length; i++) {
list[i].call(proto);
}
}
}
}
@@ -521,8 +530,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
let klass = mixin ? mixin(Polymer.LegacyElementMixin(HTMLElement)) :
Polymer.LegacyElementMixin(HTMLElement);
klass = GenerateClassFromInfo(info, klass, info.behaviors);
if (info._enableDisableUpgrade) {
klass = Polymer.DisableUpgradeMixin(klass);
}
// decorate klass with registration info
klass.is = info.is;
klass.is = klass.prototype.is = info.is;
return klass;
};
lib/legacy/legacy-element-mixin.html
+6 -10
View File
@@ -94,16 +94,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
return this.prototype.importMeta;
}
static _finalizeClass() {
// Note, call `_registered` only if this specific prototype has
// an implementation; this ensures `_registered` is not called
// on extenders that do not implement it.
if (this.prototype.hasOwnProperty('_registered')) {
this.prototype._registered();
}
super._finalizeClass();
}
/**
* Legacy callback called during the `constructor`, for overriding
* by the user.
@@ -186,6 +176,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
* @suppress {invalidCasts}
*/
_initializeProperties() {
let proto = Object.getPrototypeOf(this);
if (!proto.hasOwnProperty('__hasRegisterFinished')) {
this._registered();
// backstop in case the `_registered` implementation does not set this
proto.__hasRegisterFinished = true;
}
super._initializeProperties();
this.root = /** @type {HTMLElement} */(this);
this.created();