1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-27 04:21:52 +03:00

Make audio notifs only play if the sound tweak is set

This commit is contained in:
David Baker
2016-03-04 15:29:33 +00:00
parent 1c90288bfb
commit 2a1e8ef39b

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);
} }
} }
}; };
@ -216,4 +218,4 @@ if (!global.mxNotifier) {
global.mxNotifier = Notifier; global.mxNotifier = Notifier;
} }
module.exports = global.mxNotifier; module.exports = global.mxNotifier;