deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-21 23:56:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1896 from thelounge/xpaw/fix-push-error

Browse source 
Fix error not showing up in failed push subscription
This commit is contained in:
Pavel Djundik 2017-12-24 22:53:04 +02:00 committed by GitHub
parent ff6d6e3e82 80c11f2bde
commit d2106f1782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/js/webpush.js
View file

@ -68,7 +68,7 @@ module.exports.initialize = () => {
function onPushButton() {
pushNotificationsButton.attr("disabled", true);
navigator.serviceWorker.ready.then((registration) => {
navigator.serviceWorker.ready.then((registration) =>
registration.pushManager.getSubscription().then((existingSubscription) => {
if (existingSubscription) {
socket.emit("push:unregister");
@ -100,9 +100,11 @@ function onPushButton() {
if (successful) {
alternatePushButton().removeAttr("disabled");
}
});
}).catch((err) => {
$("#pushNotificationsUnsupported span").text(err).show();
})
).catch((err) => {
$("#pushNotificationsUnsupported")
.find("span").text(`An error has occured: ${err}`).end()
.show();
});
return false;