public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into grid

Browse source 
* master:
  Marking all site stories as read with confirmation turned off should also work on mark read buttons (not just shift+a).
This commit is contained in:
Samuel Clay 2015-02-11 11:56:43 -08:00
commit b7393e70fb
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
media/js/newsblur/views/story_titles_header_view.js
View file

@ -251,7 +251,11 @@ NEWSBLUR.Views.StoryTitlesHeader = Backbone.View.extend({
mark_folder_as_read: function(e, days_back) {
if (!this.showing_fake_folder) return;
NEWSBLUR.reader.open_mark_read_modal({days: days_back || 0});
if (NEWSBLUR.assets.preference('mark_read_river_confirm')) {
NEWSBLUR.reader.open_mark_read_modal({days: days_back || 0});
} else {
NEWSBLUR.reader.mark_folder_as_read();
}
this.$('.NB-feedbar-mark-feed-read-container').fadeOut(400);
},