Commit 5efb4a91 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

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

Fixes #7252

closes #7253
parent fb06d03f

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -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)

app/assets/javascripts/app/views/notifications_view.js

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ app.views.Notifications = Backbone.View.extend({ 
    }

  },



  markAllRead: function() {

  markAllRead: function(evt) {

    evt.preventDefault();

    this.collection.setAllRead();

  },

spec/javascripts/app/views/notifications_view_spec.js

+8 −1
Original line number Diff line number Diff line
@@ -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() {