Skip to content
Extraits de code Groupes Projets
Valider 5efb4a91 rédigé par Steffen van Bergerem's avatar Steffen van Bergerem Validation de Benjamin Neff
Parcourir les fichiers

Prevent scroll to top when clicking 'mark all as read' in the notification dropdown

Fixes #7252

closes #7253
parent fb06d03f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -7,6 +7,7 @@
## Bug fixes
* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)
* Fix jasmine tests in firefox [#7246](https://github.com/diaspora/diaspora/pull/7246)
* Prevent scroll to top when clicking 'mark all as read' in the notification dropdown [#7253](https://github.com/diaspora/diaspora/pull/7253)
## Features
* Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)
......
......@@ -28,7 +28,8 @@ app.views.Notifications = Backbone.View.extend({
}
},
markAllRead: function() {
markAllRead: function(evt) {
evt.preventDefault();
this.collection.setAllRead();
},
......
......@@ -168,9 +168,16 @@ describe("app.views.Notifications", function() {
describe("markAllRead", function() {
it("calls collection#setAllRead", function() {
spyOn(this.collection, "setAllRead");
this.view.markAllRead();
this.view.markAllRead($.Event());
expect(this.collection.setAllRead).toHaveBeenCalled();
});
it("calls preventDefault", function() {
var evt = $.Event();
spyOn(evt, "preventDefault");
this.view.markAllRead(evt);
expect(evt.preventDefault).toHaveBeenCalled();
});
});
describe("onChangedUnreadStatus", function() {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter