Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/core/a-entity.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,6 @@ var proto = Object.create(ANode.prototype, {
}
},

/**
* Apply mixin to component.
*/
handleMixinUpdate: {
value: function (attrName) {
if (!attrName) {
this.updateComponents();
return;
}
this.updateComponent(attrName, this.getDOMAttribute(attrName));
}
},

getObject3D: {
value: function (type) {
return this.object3DMap[type];
Expand Down
1 change: 1 addition & 0 deletions src/core/a-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = registerElement('a-mixin', {
attributeChangedCallback: {
value: function (attr, oldVal, newVal) {
this.cacheAttribute(attr, newVal);
this.updateEntities();
}
},

Expand Down
45 changes: 1 addition & 44 deletions src/core/a-node.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/* global CustomEvent, MutationObserver */
/* global CustomEvent */
var registerElement = require('./a-register-element').registerElement;
var isNode = require('./a-register-element').isNode;
var utils = require('../utils/');

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

var MIXIN_OBSERVER_CONFIG = {attributes: true};

/**
* Base class for A-Frame that manages loading of objects.
*
Expand All @@ -22,7 +20,6 @@ module.exports = registerElement('a-node', {
this.hasLoaded = false;
this.isNode = true;
this.mixinEls = [];
this.mixinObservers = {};
},
writable: window.debug
},
Expand Down Expand Up @@ -212,7 +209,6 @@ module.exports = registerElement('a-node', {
// Register mixin.
this.computedMixinStr = this.computedMixinStr + ' ' + mixinEl.id;
this.mixinEls.push(mixinEl);
this.attachMixinListener(mixinEl);
}
},

Expand All @@ -235,48 +231,9 @@ module.exports = registerElement('a-node', {
break;
}
}
this.removeMixinListener(mixinId);
}
},

removeMixinListener: {
value: function (mixinId) {
var observer = this.mixinObservers[mixinId];
if (!observer) { return; }
observer.disconnect();
this.mixinObservers[mixinId] = null;
}
},

/**
* Add mutation observer from entity to mixin.
*/
attachMixinListener: {
value: function (mixinEl) {
var currentObserver;
var mixinId;
var observer;
var self = this;

if (!mixinEl) { return; }

mixinId = mixinEl.id;
currentObserver = this.mixinObservers[mixinId];
if (currentObserver) { return; }

// Add observer.
observer = new MutationObserver(function (mutations) {
self.handleMixinUpdate(mutations[0].attributeName);
});
observer.observe(mixinEl, MIXIN_OBSERVER_CONFIG);
this.mixinObservers[mixinId] = observer;
}
},

handleMixinUpdate: {
value: function () { /* no-op */ }
},

/**
* Emit a DOM event.
*
Expand Down