Skip to content

Commit ffc72d0

Browse files
committed
rename isNode to isANode
1 parent b9e4838 commit ffc72d0

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Diff for: src/core/a-node.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export var knownTags = {
1414
'a-entity': true
1515
};
1616

17-
function isNode (node) {
18-
return node.tagName.toLowerCase() in knownTags || node.isNode;
17+
function isANode (node) {
18+
return node.tagName.toLowerCase() in knownTags || node.isANode;
1919
}
2020

2121
/**
@@ -29,7 +29,7 @@ export class ANode extends HTMLElement {
2929
super();
3030
this.computedMixinStr = '';
3131
this.hasLoaded = false;
32-
this.isNode = true;
32+
this.isANode = true;
3333
this.mixinEls = [];
3434
}
3535

@@ -119,7 +119,7 @@ export class ANode extends HTMLElement {
119119
if (this.hasLoaded) { return; }
120120

121121
// Default to waiting for all nodes.
122-
childFilter = childFilter || isNode;
122+
childFilter = childFilter || isANode;
123123
// Wait for children to load (if any), then load.
124124
children = this.getChildren();
125125
childrenLoaded = children.filter(childFilter).map(function (child) {

Diff for: src/systems/camera.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export var System = registerSystem('camera', {
5959
});
6060

6161
// Load camera and wait for camera to initialize.
62-
if (cameraEls[i].isNode) {
62+
if (cameraEls[i].isANode) {
6363
cameraEls[i].load();
6464
} else {
6565
cameraEls[i].addEventListener('nodeready', function () {

Diff for: tests/core/a-entity.test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ suite('a-entity', function () {
3737
});
3838

3939
test('createdCallback', function () {
40-
assert.ok(el.isNode);
40+
assert.ok(el.isANode);
4141
assert.ok(el.isEntity);
4242
});
4343

@@ -669,9 +669,9 @@ suite('a-entity', function () {
669669
el.appendChild(a);
670670
el.appendChild(b);
671671
setTimeout(function () {
672-
a.isNode = false;
672+
a.isANode = false;
673673
a.hasLoaded = false;
674-
b.isNode = false;
674+
b.isANode = false;
675675
b.hasLoaded = false;
676676
el.hasLoaded = false;
677677
el.addEventListener('loaded', function () {
@@ -697,9 +697,9 @@ suite('a-entity', function () {
697697
el.appendChild(a);
698698
el.appendChild(b);
699699
setTimeout(function () {
700-
a.isNode = false;
700+
a.isANode = false;
701701
a.hasLoaded = false;
702-
b.isNode = false;
702+
b.isANode = false;
703703
b.hasLoaded = false;
704704
el.hasLoaded = false;
705705
el.addEventListener('loaded', function () {

0 commit comments

Comments
 (0)