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

Correctly unloading Original view when switching feeds.

Browse source
This commit is contained in:
Samuel Clay 2012-06-21 19:18:44 -07:00
parent 3b80f56cf2
commit b62a6ae991
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/js/newsblur/views/feed_list_view.js
View file

@ -177,13 +177,11 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
if (options.$feed) {
feed_view = _.detect(model.views, function(view) {
console.log(["feed_view 1", view.el == options.$feed[0]]);
return view.el == options.$feed[0];
});
}
if (!feed_view) {
feed_view = _.detect(model.views, _.bind(function(view) {
console.log(["feed_view 2", view.$el.closest(this.$s.$feed_lists).length]);
return !!view.$el.closest(this.$s.$feed_lists).length;
}, this));
}

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

@ -235,7 +235,7 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
if (last_story) {
$last_story = this.find_story_in_feed_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;
if ($last_story && $last_story.length) {
last_story_same_position = parseInt($last_story.offset().top, 10)==last_story_position;
@ -252,7 +252,7 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
if (last_story_same_position && i < last_story_index) return true;
var $story = this.find_story_in_feed_iframe(story, $iframe);
NEWSBLUR.log(['Pre-fetching', i, last_story_index, last_story_same_position, $story, story.get('story_title')]);
// NEWSBLUR.log(['Pre-fetching', i, last_story_index, last_story_same_position, $story, story.get('story_title')]);
if (!$story ||
!$story.length ||
this.flags['iframe_fetching_story_locations'] ||
@ -348,6 +348,8 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
var $taskbar_view_page = $('.NB-taskbar .task_view_page');
$taskbar_view_page.removeClass('NB-task-return');
clearInterval(this.flags['iframe_scroll_snapback_check']);
this.flags['iframe_story_locations_fetched'] = false;
NEWSBLUR.reader.flags['iframe_prevented_from_loading'] = false;
@ -400,17 +402,24 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
this.setup_events();
this.$el.ready(function() {
if (feed_id != NEWSBLUR.reader.active_feed) {
console.log(["Switched feed, unloading iframe"]);
self.unload_feed_iframe();
return;
}
setTimeout(function() {
self.$el.load(function() {
self.return_to_snapback_position(true);
});
}, 50);
self.flags['iframe_scroll_snapback_check'] = setInterval(function() {
NEWSBLUR.log(['Checking scroll', self.iframe_scroll, self.flags.iframe_scroll_snap_back_prepared]);
NEWSBLUR.log(['Checking scroll', self.iframe_scroll, self.flags.iframe_scroll_snap_back_prepared, self.flags['iframe_scroll_snapback_check']]);
if (self.iframe_scroll && self.flags.iframe_scroll_snap_back_prepared) {
self.return_to_snapback_position();
} else {
console.log(["clearing scroll"]);
clearInterval(self.flags['iframe_scroll_snapback_check']);
}
}, 500);