Fix issue 2293: click on read notification focus bug

openshift · Oct 19, 2017 · ae57692 · ae57692
1 parent a7bc1f0
commit ae57692
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 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"
@@ -88,7 +87,14 @@
             <span ng-if="!$last" class="toast-action-divider">|</span>
           </span>
         </span>
-
+        <a
+          ng-if="notification.unread"
+          href=""
+          class="sr-only sr-only-focusable"
+          ng-click="$ctrl.customScope.markRead(notification)">
+          <span class="sr-only">Message Unread. </span>
+          <span>Mark Read</span>
+        </a>
       </div>
       <div
         ng-if="notification.event.count > 1"

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7785,7 +7785,7 @@ 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\" 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" +
@@ -7825,6 +7825,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span ng-if=\"!$last\" class=\"toast-action-divider\">|</span>\n" +
     "</span>\n" +
     "</span>\n" +
+    "<a ng-if=\"notification.unread\" href=\"\" class=\"sr-only sr-only-focusable\" ng-click=\"$ctrl.customScope.markRead(notification)\">\n" +
+    "<span class=\"sr-only\">Message Unread. </span>\n" +
+    "<span>Mark Read</span>\n" +
+    "</a>\n" +
     "</div>\n" +
     "<div ng-if=\"notification.event.count > 1\" class=\"text-muted small\">\n" +
     "{{notification.event.count}} times in the last\n" +