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

Selecting the correct social feed and scrolling to it.

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

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

@ -1266,7 +1266,7 @@
this.iframe_scroll = null;
this.flags['opening_feed'] = true;
feed.set('selected', true);
feed.set('selected', true, options);
this.make_feed_title_in_stories(feed.id);
this.$s.$body.addClass('NB-view-river');
this.flags.social_view = true;

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

@ -177,11 +177,15 @@ 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 = model.views[0];
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));
}
if (feed_view) {
@ -195,10 +199,10 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
// console.log(["scroll_to_show_selected_feed", feed_view, feed_view.$el, is_feed_visible]);
if (!is_feed_visible) {
var container_offset = $feed_lists.position().top;
var scroll = feed_view.$el.position().top;
var container = $feed_lists.scrollTop();
var height = $feed_lists.outerHeight();
console.log(["scroll feed list", scroll, container, height]);
$feed_lists.scrollTop(scroll+container-height/5);
}
},