public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-11-01 09:09:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Geometrically fetching original view (already doing this for feed view).

Browse source
This commit is contained in:
Samuel Clay 2012-06-22 15:24:32 -07:00
parent d5d6a6c8d7
commit 0b962e22c2
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
media/js/newsblur/views/original_tab_view.js
View file

@ -2,17 +2,7 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
initialize: function() { initialize: function() {
_.bindAll(this, 'handle_scroll_feed_iframe', 'handle_mousemove_iframe_view', 'setup_events'); _.bindAll(this, 'handle_scroll_feed_iframe', 'handle_mousemove_iframe_view', 'setup_events');
this.cache = { this.reset_flags();
iframe: {},
prefetch_iteration: 0
};
this.flags = {
iframe_fetching_story_locations: false,
iframe_story_locations_fetched: false
};
this.locks = {
iframe_buster_buster: false
};
this.unload_feed_iframe(); this.unload_feed_iframe();
this.setElement(NEWSBLUR.reader.$s.$feed_iframe); this.setElement(NEWSBLUR.reader.$s.$feed_iframe);
@ -23,6 +13,23 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
}, },
reset_flags: function() {
this.cache = {
iframe: {},
prefetch_iteration: 0
};
this.flags = {
iframe_fetching_story_locations: false,
iframe_story_locations_fetched: false
};
this.counts = {
positions_timer: 0
};
this.locks = {
iframe_buster_buster: false
};
},
setup_events: function() { setup_events: function() {
var $iframe_contents = this.$el.contents(); var $iframe_contents = this.$el.contents();
$iframe_contents.unbind('scroll').scroll(this.handle_scroll_feed_iframe); $iframe_contents.unbind('scroll').scroll(this.handle_scroll_feed_iframe);
@ -284,9 +291,11 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
} }
}, },
fetch_story_locations_in_story_frame: function($iframe) { fetch_story_locations_in_story_frame: function($iframe, options) {
var self = this; var self = this;
options = options || {};
if (!$iframe) $iframe = this.$el.contents(); if (!$iframe) $iframe = this.$el.contents();
if (options.reset_timer) this.counts['positions_timer'] = 0;
this.flags['iframe_fetching_story_locations'] = true; this.flags['iframe_fetching_story_locations'] = true;
this.flags['iframe_story_locations_fetched'] = false; this.flags['iframe_story_locations_fetched'] = false;
@ -305,7 +314,7 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
// NEWSBLUR.log(['Fetching story', i, story.get('story_title'), $story]); // NEWSBLUR.log(['Fetching story', i, story.get('story_title'), $story]);
if (self.cache['story_misses'] > 5) { if (self.cache['story_misses'] > 5) {
NEWSBLUR.log(['iFrame view entirely loaded', self.cache['story_misses'], self.cache.iframe_stories]); // NEWSBLUR.log(['iFrame view entirely loaded', self.cache['story_misses'], self.cache.iframe_stories]);
self.flags['iframe_story_locations_fetched'] = true; self.flags['iframe_story_locations_fetched'] = true;
self.flags['iframe_fetching_story_locations'] = false; self.flags['iframe_fetching_story_locations'] = false;
clearInterval(self.flags['iframe_scroll_snapback_check']); clearInterval(self.flags['iframe_scroll_snapback_check']);
@ -317,6 +326,13 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
return true; return true;
} }
}, this)); }, this));
NEWSBLUR.log(['Original view entirely loaded', _.keys(self.cache.iframe_stories).length + " stories", this.counts['positions_timer']/1000 + " sec delay"]);
this.counts['positions_timer'] = Math.max(this.counts['positions_timer']*2, 1000);
clearTimeout(this.flags['next_fetch']);
this.flags['next_fetch'] = _.delay(_.bind(this.fetch_story_locations_in_story_frame, this),
this.counts['positions_timer']);
}, },
reset_story_positions: function(models) { reset_story_positions: function(models) {

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

@ -26,7 +26,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
mousemove_timeout: false mousemove_timeout: false
}; };
this.counts = { this.counts = {
feed_view_positions_timer: 0 positions_timer: 0
}; };
}, },
@ -224,7 +224,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
options = options || {}; options = options || {};
var stories = NEWSBLUR.assets.stories; var stories = NEWSBLUR.assets.stories;
if (!stories || !stories.length) return; if (!stories || !stories.length) return;
if (options.reset_timer) this.counts['feed_view_positions_timer'] = 0; if (options.reset_timer) this.counts['positions_timer'] = 0;
$.extend(this.cache, { $.extend(this.cache, {
'feed_view_story_positions': {}, 'feed_view_story_positions': {},
@ -236,12 +236,12 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
}, this)); }, this));
this.flags['feed_view_positions_calculated'] = true; this.flags['feed_view_positions_calculated'] = true;
// NEWSBLUR.log(['Feed view entirely loaded', NEWSBLUR.assets.stories.length + " stories", this.counts['feed_view_positions_timer']/1000 + " sec delay"]); // NEWSBLUR.log(['Feed view entirely loaded', NEWSBLUR.assets.stories.length + " stories", this.counts['positions_timer']/1000 + " sec delay"]);
this.counts['feed_view_positions_timer'] = Math.max(this.counts['feed_view_positions_timer']*2, 1000); this.counts['positions_timer'] = Math.max(this.counts['positions_timer']*2, 1000);
clearTimeout(this.flags['next_fetch']); clearTimeout(this.flags['next_fetch']);
this.flags['next_fetch'] = _.delay(_.bind(this.fetch_story_locations_in_feed_view, this), this.flags['next_fetch'] = _.delay(_.bind(this.fetch_story_locations_in_feed_view, this),
this.counts['feed_view_positions_timer']); this.counts['positions_timer']);
}, },
determine_feed_view_story_position: function(story) { determine_feed_view_story_position: function(story) {