diff --git a/app/js/lib/push_worker.js b/app/js/lib/push_worker.js index 06fbc554..aae28ae2 100644 --- a/app/js/lib/push_worker.js +++ b/app/js/lib/push_worker.js @@ -28,8 +28,10 @@ self.addEventListener('push', function(event) { var closeAll = obj.badge ? !fireNotification(obj, event) : true if (closeAll) { + console.log('[SW] Closing all notifications on push') var promise = self.registration.showNotification('Telegram').then(function () { - return closeAllNotifications(obj) + // return closeAllNotifications() + setTimeout(closeAllNotifications, 100) }).catch(function (error) { console.error('Show notification error', error) }) @@ -65,7 +67,7 @@ self.addEventListener('message', function(event) { } } if (event.data.type == 'notifications_clear') { - closeAllNotifications(event.data) + closeAllNotifications() } if (event.data.baseUrl) { baseUrl = event.data.baseUrl @@ -160,7 +162,7 @@ function removeFromNotifications(notification) { } } -function closeAllNotifications(obj) { +function closeAllNotifications() { for (var i = 0, len = notifications.length; i < len; i++) { try { notifications[i].close() diff --git a/app/service_worker.js b/app/service_worker.js index e82d7dad..a5c75848 100644 --- a/app/service_worker.js +++ b/app/service_worker.js @@ -1,3 +1,3 @@ importScripts('js/lib/push_worker.js') -// Version 49 \ No newline at end of file +// Version 50 \ No newline at end of file