public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turning off progress bar on river. Fixing Show Hidden Stories indicator to show when there are either hidden stories or a negative unread count.

Browse source
This commit is contained in:
Samuel Clay 2013-07-08 18:59:31 -07:00
parent aa68d22962
commit 6626ef8daf
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1526,6 +1526,9 @@
}
this.active_folder = folder || NEWSBLUR.assets.folders;
if (NEWSBLUR.app.story_unread_counter) {
NEWSBLUR.app.story_unread_counter.remove();
}
this.iframe_scroll = null;
this.flags['opening_feed'] = true;
this.$s.$body.addClass('NB-view-river');
@ -1568,7 +1571,7 @@
NEWSBLUR.app.story_titles.show_loading(options);
}
NEWSBLUR.app.taskbar_info.hide_stories_error();
NEWSBLUR.app.taskbar_info.show_stories_progress_bar(feeds.length);
// NEWSBLUR.app.taskbar_info.show_stories_progress_bar(feeds.length);
this.model.fetch_river_stories(this.active_feed, feeds, 1,
_.bind(this.post_open_river_stories, this), NEWSBLUR.app.taskbar_info.show_stories_error, true);
},
@ -1597,11 +1600,11 @@
} else if (this.counts['select_story_in_feed'] || this.flags['select_story_in_feed']) {
this.select_story_in_feed();
}
NEWSBLUR.app.taskbar_info.hide_stories_progress_bar(_.bind(function() {
// NEWSBLUR.app.taskbar_info.hide_stories_progress_bar(_.bind(function() {
if (first_load) {
this.make_story_titles_pane_counter();
}
}, this));
// }, this));
if (NEWSBLUR.Globals.is_anonymous) {
this.show_tryout_signup_button();
} else if (first_load) {
@ -1818,7 +1821,9 @@
this.show_last_unread_story(true);
}
if (first_load) {
NEWSBLUR.app.taskbar_info.hide_stories_progress_bar(_.bind(function() {
this.make_story_titles_pane_counter();
}, this));
this.find_story_with_action_preference_on_open_feed();
}
NEWSBLUR.app.taskbar_info.hide_stories_progress_bar();

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

@ -123,11 +123,11 @@ NEWSBLUR.Views.StoryTitlesHeader = Backbone.View.extend({
if (!NEWSBLUR.reader.active_feed) return;
NEWSBLUR.reader.flags['unread_threshold_temporarily'] = null;
var $story_titles = NEWSBLUR.reader.$s.$story_titles;
var unread_view_name = NEWSBLUR.reader.get_unread_view_name();
var $indicator = $('.NB-story-title-indicator', $story_titles);
var hidden_stories = !!NEWSBLUR.assets.stories.hidden().length;
var $indicator = this.$('.NB-story-title-indicator');
var unread_hidden_stories = NEWSBLUR.reader.flags['river_view'] ? NEWSBLUR.reader.active_folder.folders.unread_counts().ng : NEWSBLUR.assets.active_feed.unread_counts().ng;
var hidden_stories = unread_hidden_stories || !!NEWSBLUR.assets.stories.hidden().length;
console.log(["show_feed_hidden_story_title_indicator", unread_hidden_stories, hidden_stories, is_feed_load]);
if (!hidden_stories) {
$indicator.hide();
return;
@ -146,7 +146,7 @@ NEWSBLUR.Views.StoryTitlesHeader = Backbone.View.extend({
},
show_hidden_story_titles: function() {
var $indicator = $('.NB-story-title-indicator', NEWSBLUR.reader.$s.$story_titles);
var $indicator = this.$('.NB-story-title-indicator');
var unread_view_name = NEWSBLUR.reader.get_unread_view_name();
var hidden_stories_at_threshold = NEWSBLUR.assets.stories.any(function(story) {
var score = story.score();