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

Entirely re-wrote feed view story location hueristics. Also fixed feed view in chrome.

Browse source
This commit is contained in:
Samuel Clay 2010-11-04 21:49:13 -04:00
parent e4141c9569
commit 3b0abc8790
1 changed files with 35 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2060,6 +2060,7 @@
// Progressively load the images in each story, so that when one story // Progressively load the images in each story, so that when one story
// loads, the position is calculated and the next story can calculate // loads, the position is calculated and the next story can calculate
// its position (atfer its own images are loaded). // its position (atfer its own images are loaded).
this.flags.feed_view_images_loaded[story.id] = false;
(function($story, story, image_count) { (function($story, story, image_count) {
$('img', $story).load(function() { $('img', $story).load(function() {
// NEWSBLUR.log(['Loaded image', $story, story, image_count]); // NEWSBLUR.log(['Loaded image', $story, story, image_count]);
@ -2074,68 +2075,47 @@
} }
}, },
process_stories_location_in_feed_view: function(story_index, clear_cache) { prefetch_story_locations_in_feed_view: function() {
var self = this; var self = this;
var stories = this.model.stories; var stories = this.model.stories;
if (clear_cache) { // NEWSBLUR.log(['Prefetching', !this.flags['feed_view_positions_calculated'], this.flags.feed_view_images_loaded]);
if (!this.flags['feed_view_positions_calculated']) {
$.extend(this.cache, { $.extend(this.cache, {
'feed_view_story_positions': {}, 'feed_view_story_positions': {},
'feed_view_story_positions_keys': [] 'feed_view_story_positions_keys': []
}); });
}
if (!story_index) story_index = 0; for (var s in stories) {
var story = stories[s];
if (stories[story_index] && stories[story_index]['story_feed_id'] == this.active_feed) {
var story = stories[story_index];
var $story = self.cache.feed_view_stories[story.id]; var $story = self.cache.feed_view_stories[story.id];
this.determine_feed_view_story_position($story, story);
// NEWSBLUR.log(['Appending $story', $story, self.flags.feed_view_images_loaded[story.id]]); // NEWSBLUR.log(['Pre-fetching', $story, story.story_title, this.flags.feed_view_images_loaded[story.id]]);
if (self.flags.feed_view_images_loaded[story.id]) { if (!$story || !$story.length || this.flags['feed_view_positions_calculated']) break;
// NEWSBLUR.log(['Feed view story pre-loaded', $('img', $story).length + " images", $story, story_index]);
self.determine_feed_view_story_position($story, story);
self.process_stories_location_in_feed_view(story_index+1);
} else {
// Images not all loaded yet, so wait until they do or timeout
(function($story, story, story_index) {
// In case the images don't load, move on to the next story
var story_load = setTimeout(function() {
// NEWSBLUR.log(['Feed view story did not load in time', $('img', $story).length + " images", $story, story_index]);
story_load = false;
self.determine_feed_view_story_position($story, story);
self.process_stories_location_in_feed_view(story_index+1);
}, 600);
// NEWSBLUR.log(['Feed view story not loaded', $('img', $story).length + " images", $story, story_index]);
// Load each image, loading next story on last image
var recheck = function() {
if (self.flags.feed_view_images_loaded[story.id] && story_load) {
// NEWSBLUR.log(['Feed view story finally loaded', $('img', $story).length + " images", $story, story_index]);
clearTimeout(story_load);
self.determine_feed_view_story_position($story, story);
self.process_stories_location_in_feed_view(story_index+1);
} else if (story_load) {
// NEWSBLUR.log(['Feed view story loading...', $('img', $story).length + " images", $story, story_index]);
setTimeout(recheck, 200);
} }
};
setTimeout(recheck, 200);
})($story, story, story_index);
} }
} else if (stories[story_index]
&& stories[story_index]['story_feed_id'] != this.active_feed) { if (_.all(this.flags.feed_view_images_loaded) && _.keys(this.flags.feed_view_images_loaded).length > 0) {
NEWSBLUR.log(['Switched off feed early']); this.fetch_story_locations_in_feed_view();
} else { }
self.flags['feed_view_positions_calculated'] = true;
NEWSBLUR.log(['Feed view entirely loaded', stories.length + " stories"]); if (!this.flags['feed_view_positions_calculated']) {
setTimeout(function() {
if (!self.flags['feed_view_positions_calculated']) {
self.prefetch_story_locations_in_feed_view();
}
}, 2000);
}
},
fetch_story_locations_in_feed_view: function() {
this.flags['feed_view_positions_calculated'] = true;
NEWSBLUR.log(['Feed view entirely loaded', this.model.stories.length + " stories"]);
var $feed_view = this.$s.$feed_view; var $feed_view = this.$s.$feed_view;
var $stories = $('.NB-feed-stories', $feed_view); var $stories = $('.NB-feed-stories', $feed_view);
var $endbar = $.make('div', { className: 'NB-feed-story-endbar' }); var $endbar = $.make('div', { className: 'NB-feed-story-endbar' });
$stories.append($endbar); $stories.append($endbar);
}
}, },
determine_feed_view_story_position: function($story, story) { determine_feed_view_story_position: function($story, story) {
@ -2145,7 +2125,7 @@
var position = position_original + position_offset; var position = position_original + position_offset;
this.cache.feed_view_story_positions[position] = story; this.cache.feed_view_story_positions[position] = story;
this.cache.feed_view_story_positions_keys.push(position); this.cache.feed_view_story_positions_keys.push(position);
this.cache.feed_view_story_positions_keys.sort(function(a,b) {return a>b;}); this.cache.feed_view_story_positions_keys.sort(function(a, b) { return a-b; });
// NEWSBLUR.log(['Positioning story', position, $story, story, this.cache.feed_view_story_positions_keys]); // NEWSBLUR.log(['Positioning story', position, $story, story, this.cache.feed_view_story_positions_keys]);
} }
}, },
@ -2756,9 +2736,9 @@
// NEWSBLUR.log(['Show/Hide stories', $stories_show.filter(':visible').length, $stories_show.length, $stories_hide.filter(':visible').length, $stories_hide.length]); // NEWSBLUR.log(['Show/Hide stories', $stories_show.filter(':visible').length, $stories_show.length, $stories_hide.filter(':visible').length, $stories_hide.length]);
setTimeout(function() { setTimeout(function() {
if (!self.flags['feed_view_positions_calculated']) { if (!self.flags['feed_view_positions_calculated']) {
self.process_stories_location_in_feed_view(0, true); self.prefetch_story_locations_in_feed_view();
} }
}, 750); }, 500);
} }
} }