mirror of
https://github.com/thelounge/thelounge
synced 2024-11-10 14:44:13 +00:00
Merge pull request #732 from thelounge/astorije/fix-notifications
Silence failures to trigger notifications when not available
This commit is contained in:
commit
49c473c85c
1 changed files with 23 additions and 14 deletions
|
@ -1011,7 +1011,11 @@ $(function() {
|
|||
if (msg.highlight || (options.notifyAllMessages && msg.type === "message")) {
|
||||
if (!document.hasFocus() || !$(target).hasClass("active")) {
|
||||
if (options.notification) {
|
||||
pop.play();
|
||||
try {
|
||||
pop.play();
|
||||
} catch (exception) {
|
||||
// On mobile, sounds can not be played without user interaction.
|
||||
}
|
||||
}
|
||||
toggleNotificationMarkers(true);
|
||||
|
||||
|
@ -1031,19 +1035,24 @@ $(function() {
|
|||
body = msg.text.replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "").trim();
|
||||
}
|
||||
|
||||
var notify = new Notification(title, {
|
||||
body: body,
|
||||
icon: "img/logo-64.png",
|
||||
tag: target
|
||||
});
|
||||
notify.onclick = function() {
|
||||
window.focus();
|
||||
button.click();
|
||||
this.close();
|
||||
};
|
||||
window.setTimeout(function() {
|
||||
notify.close();
|
||||
}, 5 * 1000);
|
||||
try {
|
||||
var notify = new Notification(title, {
|
||||
body: body,
|
||||
icon: "img/logo-64.png",
|
||||
tag: target
|
||||
});
|
||||
notify.onclick = function() {
|
||||
window.focus();
|
||||
button.click();
|
||||
this.close();
|
||||
};
|
||||
window.setTimeout(function() {
|
||||
notify.close();
|
||||
}, 5 * 1000);
|
||||
} catch (exception) {
|
||||
// `new Notification(...)` is not supported and should be silenced.
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue