diff --git a/src/views/notifications.html b/src/views/notifications.html index 52053accf..2d9a2f458 100644 --- a/src/views/notifications.html +++ b/src/views/notifications.html @@ -2,7 +2,7 @@
-

Notifications

+

Notifications

diff --git a/src/views/notifications.js b/src/views/notifications.js index 56bcb0356..538f1f9ac 100644 --- a/src/views/notifications.js +++ b/src/views/notifications.js @@ -5,6 +5,8 @@ angular.module('Application').controller('NotificationsController', ['$scope', 'Client', function ($scope, Client) { + $scope.clearAllBusy = false; + $scope.notifications = { notifications: [], activeNotification: null, @@ -54,14 +56,15 @@ angular.module('Application').controller('NotificationsController', ['$scope', ' }, clearAll: function () { - $scope.notifications.busy = true; + $scope.clearAllBusy = true; asyncForEach($scope.notifications.notifications, function (notification, callback) { + if (notification.acknowledged) return callback(); $scope.notifications.ack(notification, callback); }, function (error) { if (error) console.error(error); - $scope.notifications.busy = false; + $scope.clearAllBusy = false; }); } };