Fix issue 2293: click on read notification focus bug

openshift · Oct 18, 2017 · 37ea856 · 37ea856
1 parent a7bc1f0
commit 37ea856
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/views/directives/notifications/notification-body.html b/app/views/directives/notifications/notification-body.html
@@ -1,7 +1,6 @@
 <div
   class="drawer-pf-notification-inner"
-  tabindex="0"
-  ng-click="$ctrl.customScope.markRead(notification)">
+  ng-click="notification.unread && $ctrl.customScope.markRead(notification)">
   <button
     class="btn btn-link pull-right drawer-pf-notification-close"
     type="button"
@@ -10,6 +9,11 @@
     <span class="sr-only">Clear notification</span>
     <span aria-hidden="true" class="pficon pficon-close"></span>
   </button>
+  <button
+    class="sr-only"
+    ng-click="notification.unread && $ctrl.customScope.markRead(notification)">
+    Mark Read
+  </button>
   <div
     uib-dropdown
     class="dropdown pull-right dropdown-kebab-pf"

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7785,11 +7785,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
 
   $templateCache.put('views/directives/notifications/notification-body.html',
-    "<div class=\"drawer-pf-notification-inner\" tabindex=\"0\" ng-click=\"$ctrl.customScope.markRead(notification)\">\n" +
+    "<div class=\"drawer-pf-notification-inner\" tabindex=\"0\" ng-click=\"notification.unread && $ctrl.customScope.markRead(notification)\">\n" +
     "<button class=\"btn btn-link pull-right drawer-pf-notification-close\" type=\"button\" ng-if=\"!notification.actions.length\" ng-click=\"$ctrl.customScope.clear(notification, $index, notificationGroup)\">\n" +
     "<span class=\"sr-only\">Clear notification</span>\n" +
     "<span aria-hidden=\"true\" class=\"pficon pficon-close\"></span>\n" +
     "</button>\n" +
+    "<button class=\"sr-only\" ng-click=\"notification.unread && $ctrl.customScope.markRead(notification)\">\n" +
+    "Mark Read\n" +
+    "</button>\n" +
     "<div uib-dropdown class=\"dropdown pull-right dropdown-kebab-pf\" ng-if=\"notification.actions.length\">\n" +
     "<button uib-dropdown-toggle class=\"btn btn-link dropdown-toggle\" type=\"button\" id=\"dropdownKebabRight-{{$id}}\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"true\">\n" +
     "<span class=\"fa fa-ellipsis-v\"></span>\n" +