Skip to content

Commit 6c9f98e

Browse files
ngokevindmarcos
authored andcommitted
remove unused / redundant mixin observers (#3831)
1 parent 148979b commit 6c9f98e

File tree

3 files changed

+2
-57
lines changed

3 files changed

+2
-57
lines changed

src/core/a-entity.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,6 @@ var proto = Object.create(ANode.prototype, {
111111
}
112112
},
113113

114-
/**
115-
* Apply mixin to component.
116-
*/
117-
handleMixinUpdate: {
118-
value: function (attrName) {
119-
if (!attrName) {
120-
this.updateComponents();
121-
return;
122-
}
123-
this.updateComponent(attrName, this.getDOMAttribute(attrName));
124-
}
125-
},
126-
127114
getObject3D: {
128115
value: function (type) {
129116
return this.object3DMap[type];

src/core/a-mixin.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = registerElement('a-mixin', {
2222
attributeChangedCallback: {
2323
value: function (attr, oldVal, newVal) {
2424
this.cacheAttribute(attr, newVal);
25+
this.updateEntities();
2526
}
2627
},
2728

src/core/a-node.js

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
/* global CustomEvent, MutationObserver */
1+
/* global CustomEvent */
22
var registerElement = require('./a-register-element').registerElement;
33
var isNode = require('./a-register-element').isNode;
44
var utils = require('../utils/');
55

66
var warn = utils.debug('core:a-node:warn');
77
var error = utils.debug('core:a-node:error');
88

9-
var MIXIN_OBSERVER_CONFIG = {attributes: true};
10-
119
/**
1210
* Base class for A-Frame that manages loading of objects.
1311
*
@@ -22,7 +20,6 @@ module.exports = registerElement('a-node', {
2220
this.hasLoaded = false;
2321
this.isNode = true;
2422
this.mixinEls = [];
25-
this.mixinObservers = {};
2623
},
2724
writable: window.debug
2825
},
@@ -212,7 +209,6 @@ module.exports = registerElement('a-node', {
212209
// Register mixin.
213210
this.computedMixinStr = this.computedMixinStr + ' ' + mixinEl.id;
214211
this.mixinEls.push(mixinEl);
215-
this.attachMixinListener(mixinEl);
216212
}
217213
},
218214

@@ -235,48 +231,9 @@ module.exports = registerElement('a-node', {
235231
break;
236232
}
237233
}
238-
this.removeMixinListener(mixinId);
239-
}
240-
},
241-
242-
removeMixinListener: {
243-
value: function (mixinId) {
244-
var observer = this.mixinObservers[mixinId];
245-
if (!observer) { return; }
246-
observer.disconnect();
247-
this.mixinObservers[mixinId] = null;
248234
}
249235
},
250236

251-
/**
252-
* Add mutation observer from entity to mixin.
253-
*/
254-
attachMixinListener: {
255-
value: function (mixinEl) {
256-
var currentObserver;
257-
var mixinId;
258-
var observer;
259-
var self = this;
260-
261-
if (!mixinEl) { return; }
262-
263-
mixinId = mixinEl.id;
264-
currentObserver = this.mixinObservers[mixinId];
265-
if (currentObserver) { return; }
266-
267-
// Add observer.
268-
observer = new MutationObserver(function (mutations) {
269-
self.handleMixinUpdate(mutations[0].attributeName);
270-
});
271-
observer.observe(mixinEl, MIXIN_OBSERVER_CONFIG);
272-
this.mixinObservers[mixinId] = observer;
273-
}
274-
},
275-
276-
handleMixinUpdate: {
277-
value: function () { /* no-op */ }
278-
},
279-
280237
/**
281238
* Emit a DOM event.
282239
*

0 commit comments

Comments
 (0)