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

Fixing loading of feed pages for hiddne story titles and hidden stories.

Browse source
This commit is contained in:
Samuel Clay 2013-06-20 15:16:55 -07:00
parent aeefbb645b
commit 3be98b41fa
2 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2170,32 +2170,32 @@
var feed_id = this.active_feed;
var feed = this.model.get_feed(feed_id);
if (!this.flags['opening_feed']) {
this.flags['opening_feed'] = true;
this.counts['page'] += 1;
NEWSBLUR.app.story_titles.show_loading(options);
if (this.active_feed == 'starred') {
this.model.fetch_starred_stories(this.counts['page'], _.bind(this.post_open_starred_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else if (this.flags['social_view'] && _.contains(['river:blurblogs', 'river:global'], this.active_feed)) {
this.model.fetch_river_blurblogs_stories(this.active_feed,
this.counts['page'],
{'global': this.flags.global_blurblogs},
_.bind(this.post_open_river_blurblogs_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else if (this.flags['social_view']) {
this.model.fetch_social_stories(this.active_feed,
this.counts['page'], _.bind(this.post_open_social_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else if (this.flags['river_view']) {
this.model.fetch_river_stories(this.active_feed, this.cache['river_feeds_with_unreads'],
this.counts['page'], _.bind(this.post_open_river_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else {
this.model.load_feed(feed_id, this.counts['page'], false,
$.rescope(this.post_open_feed, this), NEWSBLUR.app.taskbar_info.show_stories_error);
}
if (this.flags['opening_feed']) return;
this.flags['opening_feed'] = true;
this.counts['page'] += 1;
NEWSBLUR.app.story_titles.show_loading(options);
if (this.active_feed == 'starred') {
this.model.fetch_starred_stories(this.counts['page'], _.bind(this.post_open_starred_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else if (this.flags['social_view'] && _.contains(['river:blurblogs', 'river:global'], this.active_feed)) {
this.model.fetch_river_blurblogs_stories(this.active_feed,
this.counts['page'],
{'global': this.flags.global_blurblogs},
_.bind(this.post_open_river_blurblogs_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else if (this.flags['social_view']) {
this.model.fetch_social_stories(this.active_feed,
this.counts['page'], _.bind(this.post_open_social_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else if (this.flags['river_view']) {
this.model.fetch_river_stories(this.active_feed, this.cache['river_feeds_with_unreads'],
this.counts['page'], _.bind(this.post_open_river_stories, this),
NEWSBLUR.app.taskbar_info.show_stories_error, false);
} else {
this.model.load_feed(feed_id, this.counts['page'], false,
$.rescope(this.post_open_feed, this), NEWSBLUR.app.taskbar_info.show_stories_error);
}
},

14
media/js/newsblur/views/story_list_view.js
View file

@ -3,6 +3,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
el: '.NB-feed-stories',
initialize: function() {
_.bindAll(this, 'check_feed_view_scrolled_to_bottom');
this.collection.bind('reset', this.reset_flags, this);
this.collection.bind('reset', this.render, this);
this.collection.bind('reset', this.reset_story_positions, this);
@ -55,8 +56,8 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
}
_.invoke(stories, 'watch_images_for_story_height');
this.show_correct_feed_in_feed_title_floater();
this.stories = stories;
_.defer(this.check_feed_view_scrolled_to_bottom);
},
add: function(options) {
@ -77,6 +78,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
_.invoke(stories, 'watch_images_for_story_height');
this.stories = this.stories.concat(stories);
_.defer(this.check_feed_view_scrolled_to_bottom);
} else {
this.show_no_more_stories();
}
@ -326,8 +328,9 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
check_feed_view_scrolled_to_bottom: function() {
if (!NEWSBLUR.assets.flags['no_more_stories']) {
var last_story = NEWSBLUR.assets.stories.last();
if (last_story.get('selected')) {
if (!NEWSBLUR.assets.stories.size()) return;
var last_story = _.last(NEWSBLUR.assets.stories.visible());
if (!last_story || last_story.get('selected')) {
NEWSBLUR.reader.load_page_of_feed_stories();
return;
}
@ -338,10 +341,11 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
var full_height = ($last_story.length && $last_story.offset().top) + $last_story.height() - container_offset;
var visible_height = this.$el.height();
var scroll_y = this.$el.scrollTop();
// Fudge factor is simply because it looks better at 64 pixels off.
// NEWSBLUR.log(['check_feed_view_scrolled_to_bottom', full_height, container_offset, visible_height, scroll_y, NEWSBLUR.reader.flags['opening_feed']]);
if ((visible_height + 64) >= full_height) {
// NEWSBLUR.log(['Feed view scroll', full_height, container_offset, visible_height, scroll_y]);
// NEWSBLUR.log(['check_feed_view_scrolled_to_bottom', full_height, container_offset, visible_height, scroll_y, NEWSBLUR.reader.flags['opening_feed']]);
NEWSBLUR.reader.load_page_of_feed_stories();
}
}