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

View File

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