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

Mimicking river on dashboard w.r.t. visible feeds (unread vs read).

Browse source
This commit is contained in:
Samuel Clay 2016-12-01 12:47:01 -08:00
parent 4e1bc928a8
commit 587e7fb2a6
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
media/js/newsblur/common/assetmodel.js
View file

@ -708,7 +708,8 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
feeds: feeds,
limit: 4,
order: this.view_setting(feed_id, 'order'),
read_filter: this.view_setting(feed_id, 'read_filter')
read_filter: this.view_setting(feed_id, 'read_filter'),
include_hidden: false
}, pre_callback, error_callback, {
'ajax_group': 'feed_page',
'request_type': 'GET'

1
media/js/newsblur/reader/reader.js
View file

@ -4920,6 +4920,7 @@
_.delay(_.bind(function() {
this.model.feed_unread_count(feed_id, options.callback);
NEWSBLUR.app.dashboard_river.load_stories();
}, this), Math.random() * delay);
},

15
media/js/newsblur/views/dashboard_river.js
View file

@ -7,6 +7,8 @@ NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
},
initialize: function() {
this.active_feed = 'river:';
this.active_folder = NEWSBLUR.assets.folders;
this.$stories = this.$(".NB-module-item .NB-story-titles");
this.story_titles = new NEWSBLUR.Views.StoryTitlesView({
el: this.$stories,
@ -24,7 +26,18 @@ NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
// ==========
load_stories: function() {
var feeds = NEWSBLUR.assets.folders.feed_ids_in_folder();
// var feeds = NEWSBLUR.assets.folders.feed_ids_in_folder();
var visible_only = NEWSBLUR.assets.view_setting(this.active_feed, 'read_filter') == 'unread';
var feeds;
if (visible_only) {
feeds = _.pluck(this.active_folder.feeds_with_unreads(), 'id');
if (!feeds.length) {
feeds = this.active_folder.feed_ids_in_folder();
}
} else {
feeds = this.active_folder.feed_ids_in_folder();
}
this.story_titles.show_loading();
NEWSBLUR.assets.fetch_dashboard_stories("river:", feeds,
_.bind(this.post_load_stories, this), NEWSBLUR.app.taskbar_info.show_stories_error);