Skip to content

allow removal of mixed-in components (removeAttribute) #3275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2017
Merged

allow removal of mixed-in components (removeAttribute) #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/core/a-entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,10 @@ var proto = Object.create(ANode.prototype, {
value: function (name) {
var component;
var isDefault;
var isMixedIn;

// Don't remove default or mixed-in components.
isDefault = name in this.defaultComponents;
isMixedIn = isComponentMixedIn(name, this.mixinEls);
if (isDefault || isMixedIn) { return; }
if (isDefault) { return; }

component = this.components[name];
if (!component) { return; }
Expand Down Expand Up @@ -517,7 +515,7 @@ var proto = Object.create(ANode.prototype, {

// Remove component.
if (component && propertyName === undefined) {
this.setEntityAttribute(attr, undefined, null);
this.removeComponent(attr);
// Do not remove the component from the DOM if default component.
if (this.components[attr]) { return; }
}
Expand Down
6 changes: 3 additions & 3 deletions tests/core/a-entity.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,17 +981,17 @@ suite('a-entity', function () {
assert.ok('position' in el.components);
});

test('does not remove mixed-in component', function () {
test('can remove mixed-in component', function () {
var el = this.el;
var mixinId = 'geometry';
mixinFactory(mixinId, {geometry: 'primitive: box'});
el.setAttribute('mixin', mixinId);
el.setAttribute('geometry', 'primitive: sphere');
assert.ok('geometry' in el.components);
el.removeAttribute('geometry');
assert.notEqual(el.getAttribute('geometry'), null);
assert.equal(el.getAttribute('geometry'), null);
// Geometry still exists since it is mixed in.
assert.ok('geometry' in el.components);
assert.notOk('geometry' in el.components);
});

test('resets a component property', function () {
Expand Down