-
-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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
Defer initialization until end of aframe script or manual ready signal #5481
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* global CustomEvent */ | ||
|
||
/** | ||
* Flag indicating if A-Frame can initialize the scene or should wait. | ||
*/ | ||
module.exports.canInitializeElements = false; | ||
|
||
/** | ||
* Waits for the document to be ready. | ||
*/ | ||
function waitForDocumentReadyState () { | ||
if (document.readyState === 'complete') { | ||
emitReady(); | ||
return; | ||
} | ||
|
||
document.addEventListener('readystatechange', function onReadyStateChange () { | ||
if (document.readyState !== 'complete') { return; } | ||
document.removeEventListener('readystatechange', onReadyStateChange); | ||
emitReady(); | ||
}); | ||
} | ||
module.exports.waitForDocumentReadyState = waitForDocumentReadyState; | ||
|
||
/** | ||
* Signals A-Frame that everything is ready to initialize. | ||
*/ | ||
function emitReady () { | ||
if (module.exports.canInitializeElements) { return; } | ||
module.exports.canInitializeElements = true; | ||
setTimeout(function () { | ||
document.dispatchEvent(new CustomEvent('aframeready')); | ||
}); | ||
} | ||
module.exports.emitReady = emitReady; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* global AFRAME, assert, suite, test, setup */ | ||
var readyState = require('core/readyState'); | ||
|
||
suite('readyState', function () { | ||
setup(function (done) { | ||
// Test setup initializes AFRAME when document is already ready. | ||
// This timeout ensures the readyState is reset before running the tests here. | ||
setTimeout(function () { | ||
readyState.canInitializeElements = false; | ||
done(); | ||
}); | ||
}); | ||
|
||
suite('waitForDocumentReadyState', function () { | ||
test('emits aframeready when document is ready', function (done) { | ||
var listenerSpy = this.sinon.spy(); | ||
document.addEventListener('aframeready', listenerSpy); | ||
|
||
assert.equal(document.readyState, 'complete'); | ||
readyState.waitForDocumentReadyState(); | ||
|
||
setTimeout(function () { | ||
assert.ok(listenerSpy.calledOnce); | ||
done(); | ||
}); | ||
}); | ||
}); | ||
|
||
suite('emitReady', function () { | ||
test('emits aframeready', function (done) { | ||
var listenerSpy = this.sinon.spy(); | ||
document.addEventListener('aframeready', listenerSpy); | ||
|
||
assert.ok(listenerSpy.notCalled); | ||
readyState.emitReady(); | ||
|
||
setTimeout(function () { | ||
assert.ok(listenerSpy.calledOnce); | ||
assert.ok(readyState.canInitializeElements); | ||
done(); | ||
}); | ||
}); | ||
|
||
test('emits aframeready event only once', function (done) { | ||
var listenerSpy = this.sinon.spy(); | ||
document.addEventListener('aframeready', listenerSpy); | ||
|
||
assert.ok(listenerSpy.notCalled); | ||
// Calling emitReady multiple times should result in only one event being emitted. | ||
readyState.emitReady(); | ||
readyState.emitReady(); | ||
|
||
setTimeout(function () { | ||
assert.ok(listenerSpy.calledOnce); | ||
assert.ok(readyState.canInitializeElements); | ||
|
||
// Calling again after the event fired should not emit. | ||
readyState.emitReady(); | ||
setTimeout(function () { | ||
// Assert total count is still only once. | ||
assert.ok(listenerSpy.calledOnce); | ||
assert.ok(readyState.canInitializeElements); | ||
done(); | ||
}); | ||
}); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason why this call has changed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, the inheritance was a bit wonky. The
doConnectedCallback
function was essentially setup as a "virtual function" with subclasses overriding it and calling the base implementation (super.doConnectedCallback()
), yetconnectedCallback
explicitly called theANode
implementation, forcing all subclasses to also overrideconnectedCallback
and replicating the same logic. From an OOP standpoint this didn't really make sense. Having one sharedconnectedCallback
implementation is the cleanest solution IMO.