diff --git a/Changelog.md b/Changelog.md index e532fb476c725528379caef3b83b1b398ee2a7fe..9cbe3091b2d22e9e99d895d7ac194d734d2cf531 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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) diff --git a/app/assets/javascripts/app/views/notifications_view.js b/app/assets/javascripts/app/views/notifications_view.js index 3ae156348bc23fe0c88a227e5937da5de95a7252..472dafbbf7dafc672e0c89e274fb96e85cf6c19a 100644 --- a/app/assets/javascripts/app/views/notifications_view.js +++ b/app/assets/javascripts/app/views/notifications_view.js @@ -28,7 +28,8 @@ app.views.Notifications = Backbone.View.extend({ } }, - markAllRead: function() { + markAllRead: function(evt) { + evt.preventDefault(); this.collection.setAllRead(); }, diff --git a/spec/javascripts/app/views/notifications_view_spec.js b/spec/javascripts/app/views/notifications_view_spec.js index d837703007f278cf1313ada92ae97df15ecad8a3..4e520a57c4638d2828bb0a3729cda99ac40edbc1 100644 --- a/spec/javascripts/app/views/notifications_view_spec.js +++ b/spec/javascripts/app/views/notifications_view_spec.js @@ -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() {