OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Make audio notifs only play if the sound tweak is set

pull/21833/head
David Baker 2016-03-04 15:29:33 +00:00
parent 1c90288bfb
commit 2a1e8ef39b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Notifier.js
View File

@ -35,7 +35,7 @@ var Notifier = {
return TextForEvent.textForEvent(ev);
},
displayNotification: function(ev, room) {
displayNotification: function(ev, room, actions) {
if (!global.Notification || global.Notification.permission != 'granted') {
return;
}
@ -94,7 +94,9 @@ var Notifier = {
};
var audioClip;
audioClip = playAudio();
if (actions.tweaks.sound) {
audioClip = playAudio();
}
global.setTimeout(function() {
notification.close();
@ -207,7 +209,7 @@ var Notifier = {
var actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
if (actions && actions.notify) {
this.displayNotification(ev, room);
this.displayNotification(ev, room, actions);
}
}
};
@ -216,4 +218,4 @@ if (!global.mxNotifier) {
global.mxNotifier = Notifier;
}
module.exports = global.mxNotifier;
module.exports = global.mxNotifier;