nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixes #7252

closes #7253
This commit is contained in:
Steffen van Bergerem 2016-12-15 11:38:14 +01:00 committed by Benjamin Neff
parent fb06d03f49
commit 5efb4a912e
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -7,6 +7,7 @@
## Bug fixes ## Bug fixes
* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263) * 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) * 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 ## Features
* Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265) * Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)

3
app/assets/javascripts/app/views/notifications_view.js
View file

@ -28,7 +28,8 @@ app.views.Notifications = Backbone.View.extend({
} }
}, },
markAllRead: function() { markAllRead: function(evt) {
evt.preventDefault();
this.collection.setAllRead(); this.collection.setAllRead();
}, },

9
spec/javascripts/app/views/notifications_view_spec.js
View file

@ -168,9 +168,16 @@ describe("app.views.Notifications", function() {
describe("markAllRead", function() { describe("markAllRead", function() {
it("calls collection#setAllRead", function() { it("calls collection#setAllRead", function() {
spyOn(this.collection, "setAllRead"); spyOn(this.collection, "setAllRead");
this.view.markAllRead(); this.view.markAllRead($.Event());
expect(this.collection.setAllRead).toHaveBeenCalled(); 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() { describe("onChangedUnreadStatus", function() {