From 44b4228ca4ece9c38893c37756f72f6b0a941bf2 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 16 Dec 2016 19:38:15 +0300 Subject: [PATCH] Fixed push worker --- app/js/lib/push_worker.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/js/lib/push_worker.js b/app/js/lib/push_worker.js index 4c5ef2b5..06fbc554 100644 --- a/app/js/lib/push_worker.js +++ b/app/js/lib/push_worker.js @@ -24,7 +24,10 @@ switch (location.hostname) { self.addEventListener('push', function(event) { var obj = event.data.json() console.log('[SW] push', obj) - if (!obj.badge) { + + var closeAll = obj.badge ? !fireNotification(obj, event) : true + + if (closeAll) { var promise = self.registration.showNotification('Telegram').then(function () { return closeAllNotifications(obj) }).catch(function (error) { @@ -33,8 +36,6 @@ self.addEventListener('push', function(event) { if ('waitUntil' in event) { event.waitUntil(promise) } - } else { - fireNotification(obj, event) } })