Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Update to "Handle promise rejection for sound.play() in preload" #1959

Merged
merged 7 commits into from
Jul 1, 2019
Merged

Update to "Handle promise rejection for sound.play() in preload" #1959

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc6776d
Handle promise rejection for sound.play() in preload
franzformeren May 23, 2019
04b7a28
Fixed DOMException when play request gets interrupted by a call to pa…
franzformeren Jun 28, 2019
1bd995e
Converted arrow function to normal function
franzformeren Jun 28, 2019
5931405
Now checking if promise is undefined, so it doesn't throw on Edge
Jul 1, 2019
c8b74b5
Removed empty line
Jul 1, 2019
4e9e5f5
Fixed indentation
Jul 1, 2019
db22241
Fixed indentation
Jul 1, 2019
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
16 changes: 14 additions & 2 deletions core/workspace_audio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,20 @@ Blockly.WorkspaceAudio.prototype.preload = function() {
for (var name in this.SOUNDS_) {
var sound = this.SOUNDS_[name];
sound.volume = 0.01;
sound.play();
sound.pause();
var playPromise = sound.play();

// Edge does not return a promise, so we need to check.
if (playPromise) {
// If we don't wait for the play request to complete before calling pause() we will get an exception:
// Uncaught (in promise) DOMException: The play() request was interrupted by a call to pause().
// See more: https://developers.google.com/web/updates/2017/06/play-request-was-interrupted
playPromise.then(sound.pause).catch(function() {
// Play without user interaction was prevented.
});
} else {
sound.pause();
}

// iOS can only process one sound at a time. Trying to load more than one
// corrupts the earlier ones. Just load one and leave the others uncached.
if (goog.userAgent.IPAD || goog.userAgent.IPHONE) {
Expand Down