jlengrand/webcomponentsjs
1
0
Fork 0
mirror of https://github.com/jlengrand/webcomponentsjs.git synced 2026-03-10 08:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

attached/detached -> connected/disconnected

Browse Source
This commit is contained in:
Justin Fagnani
2016-03-22 12:11:25 -07:00
parent df7df9395d
commit 3ab7343cfb
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/CustomElements/v1/CustomElements.js
View File

@@ -16,8 +16,8 @@
* @property {Function} name
* @property {Function} localName
* @property {Function} constructor
* @property {Function} attachedCallback
* @property {Function} detachedCallback
* @property {Function} connectedCallback
* @property {Function} disconnectedCallback
* @property {Function} attributeChangedCallback
* @property {String[]} observedAttributes
* http://w3c.github.io/webcomponents/spec/custom/#dfn-element-definition-construction-stack
@@ -82,13 +82,13 @@
// 5.1.13?
// 5.1.14
var attachedCallback = prototype.attachedCallback;
var connectedCallback = prototype.connectedCallback;
// 5.1.15
checkCallback(attachedCallback, localName, 'attachedCallback');
checkCallback(connectedCallback, localName, 'connectedCallback');
// 5.1.16
var detachedCallback = prototype.detachedCallback;
var disconnectedCallback = prototype.disconnectedCallback;
// 5.1.17
checkCallback(detachedCallback, localName, 'detachedCallback');
checkCallback(disconnectedCallback, localName, 'disconnectedCallback');
// 5.1.18
var attributeChangedCallback = prototype.attributeChangedCallback;
// 5.1.19
@@ -100,8 +100,8 @@
name: name,
localName: localName,
constructor: constructor,
attachedCallback: attachedCallback,
detachedCallback: detachedCallback,
connectedCallback: connectedCallback,
disconnectedCallback: disconnectedCallback,
attributeChangedCallback: attributeChangedCallback,
observedAttributes: observedAttributes,
};
@@ -316,8 +316,8 @@
if (node.__upgraded && !node.__attached) {
node.__attached = true;
var definition = registry.get(node.localName);
if (definition && definition.attachedCallback) {
definition.attachedCallback.call(node);
if (definition && definition.connectedCallback) {
definition.connectedCallback.call(node);
}
}
} while (walker.nextNode())
@@ -333,8 +333,8 @@
if (node.__upgraded && node.__attached) {
node.__attached = false;
var definition = registry.get(node.localName);
if (definition && definition.detachedCallback) {
definition.detachedCallback.call(node);
if (definition && definition.disconnectedCallback) {
definition.disconnectedCallback.call(node);
}
}
} while (walker.nextNode())

34
tests/CustomElements/v1/js/customElements.js
View File

@@ -285,11 +285,11 @@ suite('customElements', function() {
this.detached = false;
}
attachedCallback() {
connectedCallback() {
this.attached = true;
}
detachedCallback() {
disconnectedCallback() {
this.detached = true;
}
}
@@ -335,14 +335,14 @@ suite('customElements', function() {
xboo.setAttribute('foo', 'zot');
});
test('customElements.define attachedCallbacks in prototype', function(done) {
test('customElements.define connectedCallbacks in prototype', function(done) {
var inserted = 0;
class XBoo extends HTMLElement {
constructor() {
CustomElements.setCurrentTag('x-boo-at');
super();
}
attachedCallback() {
connectedCallback() {
inserted++;
}
}
@@ -361,14 +361,14 @@ suite('customElements', function() {
done();
});
test('document.registerElement detachedCallbacks in prototype', function(done) {
test('document.registerElement disconnectedCallbacks in prototype', function(done) {
var ready, inserted, removed;
class XBoo extends HTMLElement {
constructor() {
CustomElements.setCurrentTag('x-boo-ir2');
super();
}
detachedCallback() {
disconnectedCallback() {
removed = true;
}
}
@@ -387,7 +387,7 @@ suite('customElements', function() {
CustomElements.setCurrentTag('x-booboo-ir2');
super();
}
detachedCallback() {
disconnectedCallback() {
removed = true;
}
}
@@ -468,10 +468,10 @@ suite('customElements', function() {
// elementProto.createdCallback = function() {
// invocations.push('created');
// }
// elementProto.attachedCallback = function() {
// elementProto.connectedCallback = function() {
// invocations.push('entered');
// }
// elementProto.detachedCallback = function() {
// elementProto.disconnectedCallback = function() {
// invocations.push('left');
// }
// var tagName = 'x-entered-left-view';
@@ -498,10 +498,10 @@ suite('customElements', function() {
// 'created, entered then left view');
// });
//
// test('attachedCallback ordering', function() {
// test('connectedCallback ordering', function() {
// var log = [];
// var p = Object.create(HTMLElement.prototype);
// p.attachedCallback = function() {
// p.connectedCallback = function() {
// log.push(this.id);
// };
// document.registerElement('x-boo-ordering', {prototype: p});
@@ -522,10 +522,10 @@ suite('customElements', function() {
// test('attached and detached in same turn', function(done) {
// var log = [];
// var p = Object.create(HTMLElement.prototype);
// p.attachedCallback = function() {
// p.connectedCallback = function() {
// log.push('attached');
// };
// p.detachedCallback = function() {
// p.disconnectedCallback = function() {
// log.push('detached');
// };
// document.registerElement('x-ad', {prototype: p});
@@ -541,10 +541,10 @@ suite('customElements', function() {
// test('detached and re-attached in same turn', function(done) {
// var log = [];
// var p = Object.create(HTMLElement.prototype);
// p.attachedCallback = function() {
// p.connectedCallback = function() {
// log.push('attached');
// };
// p.detachedCallback = function() {
// p.disconnectedCallback = function() {
// log.push('detached');
// };
// document.registerElement('x-da', {prototype: p});
@@ -560,10 +560,10 @@ suite('customElements', function() {
// });
// });
//
// test('detachedCallback ordering', function() {
// test('disconnectedCallback ordering', function() {
// var log = [];
// var p = Object.create(HTMLElement.prototype);
// p.detachedCallback = function() {
// p.disconnectedCallback = function() {
// log.push(this.id);
// };
// document.registerElement('x-boo2-ordering', {prototype: p});