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 bug around finding stories in iframe view when the first story fails to be found during prefetch.

Browse source
This commit is contained in:
Samuel Clay 2010-11-08 19:27:57 -05:00
parent a2c6bf7f84
commit 68e217c0bc
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,11 +255,10 @@
return $story; return $story;
}, },
find_story_in_story_iframe: function(story) { find_story_in_story_iframe: function(story, $iframe) {
if (!story) return $([]); if (!story) return $([]);
this.cache.iframe['iframe'] = this.cache.iframe['iframe'] || this.$s.$story_iframe.contents(); $iframe = $iframe || this.$s.$story_iframe.contents();
var $iframe = this.cache.iframe['iframe'];
var $stories = $([]); var $stories = $([]);
if (this.flags.iframe_story_locations_fetched || story.id in this.cache.iframe_stories) { if (this.flags.iframe_story_locations_fetched || story.id in this.cache.iframe_stories) {
@ -1377,7 +1376,6 @@
var self = this; var self = this;
var stories = this.model.stories; var stories = this.model.stories;
var $iframe = this.$s.$story_iframe.contents(); var $iframe = this.$s.$story_iframe.contents();
this.cache.iframe['iframe'] = $iframe;
this.cache['prefetch_iteration'] += 1; this.cache['prefetch_iteration'] += 1;
// NEWSBLUR.log(['Prefetching', !this.flags['iframe_fetching_story_locations']]); // NEWSBLUR.log(['Prefetching', !this.flags['iframe_fetching_story_locations']]);
@ -1393,7 +1391,7 @@
var last_story = this.cache.iframe_story_positions[last_story_position]; var last_story = this.cache.iframe_story_positions[last_story_position];
var $last_story; var $last_story;
if (last_story) { if (last_story) {
$last_story = this.find_story_in_story_iframe(last_story); $last_story = this.find_story_in_story_iframe(last_story, $iframe);
} }
// NEWSBLUR.log(['last_story', last_story_index, last_story_position, last_story, $last_story]); // NEWSBLUR.log(['last_story', last_story_index, last_story_position, last_story, $last_story]);
var last_story_same_position; var last_story_same_position;
@ -1411,7 +1409,7 @@
for (var s in stories) { for (var s in stories) {
if (last_story_same_position && parseInt(s, 10) < last_story_index) continue; if (last_story_same_position && parseInt(s, 10) < last_story_index) continue;
var story = stories[s]; var story = stories[s];
var $story = this.find_story_in_story_iframe(story); var $story = this.find_story_in_story_iframe(story, $iframe);
// NEWSBLUR.log(['Pre-fetching', parseInt(s, 10), last_story_index, last_story_same_position, $story, story.story_title]); // NEWSBLUR.log(['Pre-fetching', parseInt(s, 10), last_story_index, last_story_same_position, $story, story.story_title]);
if (!$story || if (!$story ||
!$story.length || !$story.length ||
@ -1453,8 +1451,8 @@
} }
if (story && story['story_feed_id'] == this.active_feed) { if (story && story['story_feed_id'] == this.active_feed) {
var $story = this.find_story_in_story_iframe(story); var $story = this.find_story_in_story_iframe(story, $iframe);
// NEWSBLUR.log(['Prefetching story', s, story.story_title, $story]); // NEWSBLUR.log(['Fetching story', s, {'title': story.story_title}, $story]);
setTimeout(function() { setTimeout(function() {
if ((stories.length-1) >= (s+1) if ((stories.length-1) >= (s+1)