jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

stop notification click event propagation

Browse Source
This commit is contained in:
Johannes Zellner
2019-02-28 15:56:19 +01:00
parent c25c3e9daa
commit d09ac5bcc6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/notifications.html
View File

@@ -21,7 +21,7 @@
<div class="row">
<div class="col-xs-12" ng-click="notification.isCollapsed = !notification.isCollapsed" ng-class="{ 'notification-details': notification.detailsShown }">
{{ notification.title }} <small class="text-muted" uib-tooltip="{{ notification.creationTime | prettyLongDate }}">{{ notification.creationTime | prettyDate }}</small>
<button class="btn btn-xs btn-success pull-right" ng-hide="notification.acknowledged" ng-click="notifications.ack(notification)" uib-tooltip="Clear"><i class="fa fa-check"></i></button>
<button class="btn btn-xs btn-success pull-right" ng-hide="notification.acknowledged" ng-click="notifications.ack(notification, $event)" uib-tooltip="Clear"><i class="fa fa-check"></i></button>
<div uib-collapse="notification.isCollapsed" expanding="notificationExpanding(notification)">
<br/>

6
src/views/notifications.js
View File

@@ -44,9 +44,11 @@ angular.module('Application').controller('NotificationsController', ['$scope', '
$scope.notifications.activeNotification = notification;
},
ack: function (notification, callback) {
ack: function (notification, event, callback) {
callback = callback || function (error) { if (error) console.error(error); };
if (event) event.stopPropagation();
Client.ackNotification(notification.id, function (error) {
if (error) return callback(error);
@@ -66,7 +68,7 @@ angular.module('Application').controller('NotificationsController', ['$scope', '
asyncForEach($scope.notifications.notifications, function (notification, callback) {
if (notification.acknowledged) return callback();
$scope.notifications.ack(notification, callback);
$scope.notifications.ack(notification, null /* no click event */, callback);
}, function (error) {
if (error) console.error(error);