Merge branch 'MDL-60547-33' of git://github.com/cescobedo/moodle into…

… MOODLE_33_STABLE
moodle · Feb 26, 2018 · d6e63cb · d6e63cb
2 parents 504e36d + c4f22db
commit d6e63cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/message/output/popup/amd/build/notification_popover_controller.min.js b/message/output/popup/amd/build/notification_popover_controller.min.js
diff --git a/message/output/popup/amd/src/notification_popover_controller.js b/message/output/popup/amd/src/notification_popover_controller.js
@@ -357,9 +357,10 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str', 'core/url',
         ]);
 
         // Mark all notifications read if the user activates the mark all as read button.
-        this.root.on(CustomEvents.events.activate, SELECTORS.MARK_ALL_READ_BUTTON, function(e) {
+        this.root.on(CustomEvents.events.activate, SELECTORS.MARK_ALL_READ_BUTTON, function(e, data) {
             this.markAllAsRead();
             e.stopPropagation();
+            data.originalEvent.preventDefault();
         }.bind(this));
 
         // Mark individual notification read if the user activates it.