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

Merge pull request #4810 from svbergerem/notifications-no-auto-mark-as-read

Browse source 
Remove auto 'mark as read' in notifications dropdown
This commit is contained in:
Jason Robinson 2014-04-16 21:56:53 +03:00
commit b64e418020
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -24,6 +24,7 @@ Read more in [#4249](https://github.com/diaspora/diaspora/pull/4249) and [#4883]
* Replace .rvmrc by .ruby-version and .ruby-gemset [#4854](https://github.com/diaspora/diaspora/pull/4855)
* Reorder and reword items on user settings page [#4912](https://github.com/diaspora/diaspora/pull/4912)
* SPV: Improve padding and interaction counts [#4426](https://github.com/diaspora/diaspora/pull/4426)
* Remove auto 'mark as read' for notifications [#4810](https://github.com/diaspora/diaspora/pull/4810)
## Bug fixes
* Fix email body language when invite a friend [#4832](https://github.com/diaspora/diaspora/issues/4832)

7
app/assets/javascripts/widgets/notifications-badge.js
View file

@ -74,13 +74,6 @@
self.dropdownNotifications.find('.read').each(function(index) {
Diaspora.page.header.notifications.setUpRead( $(this) );
});
self.dropdownNotifications.find('.unread').each(function(index) {
var myItem = $(this);
setTimeout(function(){
if ( self.dropdownNotifications.is(":visible") )
myItem.trigger('click');
}, 2000 );
});
self.ajaxLoader.hide();
};
};