Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Silence failures to trigger notifications when not available #732

Merged
merged 2 commits into from Nov 16, 2016
Merged

Silence failures to trigger notifications when not available #732

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21ec8b
Silence failures to trigger notifications when not available
astorije Nov 7, 2016
dff1a48
Prevent sound notification to throw an exception on mobile
astorije Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 23 additions & 14 deletions client/js/lounge.js
View file
Open in desktop
Expand Up @@ -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);

Expand All @@ -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.
}

}
}
}
Expand Down