Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

#1257: Prefer 'probably' over 'maybe' when evaluating Audio support.

Browse Source
This commit is contained in:
Guus der Kinderen 2018-10-22 18:32:57 +02:00
parent c684105fed
commit daa1654d35
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -1,5 +1,7 @@
# Changelog
- #1257: Prefer 'probably' over 'maybe' when evaluating audio play support.
## 4.0.3 (2018-10-22)
- New translations: Arabic, Basque, Czech, French, German, Hungarian, Japanese, Norwegian Bokmål, Polish, Romanian, Spanish

24
src/converse-notification.js
View File

@ -109,16 +109,22 @@
// XXX Eventually this can be refactored to use Notification's sound
// feature, but no browser currently supports it.
// https://developer.mozilla.org/en-US/docs/Web/API/notification/sound
let audio;
let audioOgg, audioMp3, canPlayOgg, canPlayMp3;
if (_converse.play_sounds && !_.isUndefined(window.Audio)) {
audio = new Audio(_converse.sounds_path+"msg_received.ogg");
if (audio.canPlayType('audio/ogg')) {
audio.play();
} else {
audio = new Audio(_converse.sounds_path+"msg_received.mp3");
if (audio.canPlayType('audio/mp3')) {
audio.play();
}
audioOgg = new Audio(_converse.sounds_path+"msg_received.ogg");
canPlayOgg = audioOgg.canPlayType('audio/ogg');
audioMp3 = new Audio(_converse.sounds_path+"msg_received.mp3");
canPlayMp3 = audioMp3.canPlayType('audio/mp3');
// Prefer 'probably' over 'maybe'.
if ( canPlayOgg === 'probably') {
audioOgg.play();
} else if ( canPlayMp3 === 'probably' ) {
audioMp3.play();
} else if ( canPlayOgg === 'maybe' ) {
audioOgg.play();
} else if ( canPlayMp3 === 'maybe' ) {
audioMp3.play();
}
}
};