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

Finding next unread story. Still needs logic to be able to travel upwards instead of only downwards.

Browse source
This commit is contained in:
Samuel Clay 2012-06-13 15:54:18 -07:00
parent b0ed08bf79
commit 84a62bdc14
3 changed files with 33 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
media/js/newsblur/models/stories.js
View file

@ -140,11 +140,15 @@ NEWSBLUR.Collections.Stories = Backbone.Collection.extend({
// = Model Managers =
// ==================
visible: function(score) {
visible: function(score, unread_only) {
score = _.isUndefined(score) ? NEWSBLUR.assets.preference('unread_view') : score;
return this.select(function(story) {
return story.score() >= score;
var visible = story.score() >= score;
if (unread_only) {
return visible && !story.get('read_status');
}
return visible;
});
},
@ -192,6 +196,25 @@ NEWSBLUR.Collections.Stories = Backbone.Collection.extend({
}
},
get_next_unread_story: function(options) {
options = options || {};
var visible_stories = this.visible(options.score, true);
if (!visible_stories.length) return;
if (!this.active_story) {
return visible_stories[0];
}
var current_index = _.indexOf(visible_stories, this.active_story);
if (current_index+1 <= visible_stories.length) {
return visible_stories[current_index+1];
} else if (current_index-1 > 0) {
return visible_stories[current_index-1];
}
},
// ==========
// = Events =
// ==========

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

@ -448,30 +448,6 @@
$(':focus').blur();
},
// =======================
// = Getters and Finders =
// =======================
find_story_in_story_titles: function(story_id) {
var story = story_id && this.model.get_story(story_id);
if (!story_id) story = this.active_story;
var $stories = $('.story', this.$s.$story_titles);
var $story_title;
console.log(["DEPRECATED find_story_in_story_titles", story]);
if (story) {
$stories.each(function() {
var $this = $(this);
if ($this.data('story_id') == story.id) {
$story_title = $this;
// NEWSBLUR.log(['Finding story in story titles', $this, story_id, story]);
return false;
}
});
}
return $story_title;
},
// ==============
// = Navigation =
// ==============
@ -487,41 +463,25 @@
},
show_next_unread_story: function() {
var $story_titles = this.$s.$story_titles;
var $current_story = $('.selected', $story_titles);
var $next_story;
var unread_count = this.get_unread_count(true);
// NEWSBLUR.log(['show_next_unread_story', unread_count, $current_story]);
if (unread_count) {
if (!$current_story.length) {
// Nothing selected, choose first unread.
$next_story = $('.story:not(.read):visible:first', $story_titles);
} else {
// Start searching below, then search above current story.
$next_story = $current_story.nextAll('.story:not(.read):visible').eq(0);
if (!$next_story.length) {
$next_story = $current_story.prevAll('.story:not(.read):visible').eq(0);
}
}
var next_story = NEWSBLUR.assets.stories.get_next_unread_story();
if ($next_story && $next_story.length) {
if (next_story) {
this.counts['find_next_unread_on_page_of_feed_stories_load'] = 0;
var story_id = $next_story.data('story_id');
if (story_id) {
var story = this.model.get_story(story_id);
this.push_current_story_on_history();
story.set('selected', true);
}
} else if (this.counts['find_next_unread_on_page_of_feed_stories_load'] < this.constants.FILL_OUT_PAGES &&
this.push_current_story_on_history();
next_story.set('selected', true);
} else if (this.counts['find_next_unread_on_page_of_feed_stories_load'] <
this.constants.FILL_OUT_PAGES &&
!this.model.flags['no_more_stories']) {
// Nothing up, nothing down, but still unread. Load 1 page then find it.
this.counts['find_next_unread_on_page_of_feed_stories_load'] += 1;
this.load_page_of_feed_stories();
}
}
},
open_next_unread_story_across_feeds: function() {
@ -3418,14 +3378,8 @@
}
setTimeout(function() {
if (!self.active_story) return;
var $story = self.find_story_in_story_titles(self.active_story.id);
// NEWSBLUR.log(['$story', $story]);
if ($story && $story.length && $story.is(':visible')) {
var story = self.active_story;
self.active_story = null; // Set is in open_story(), which allows it to scroll.
NEWSBLUR.app.story_list.scroll_to_selected_story(story);
NEWSBLUR.app.story_titles.scroll_to_selected_story(story);
}
NEWSBLUR.app.story_list.scroll_to_selected_story(self.active_story);
NEWSBLUR.app.story_titles.scroll_to_selected_story(self.active_story);
}, this.model.preference('animations') ? 550 : 0);
}
},

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

@ -60,8 +60,6 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
options = options || {};
if (!story || !story.story_view) return;
console.log(["Scroll in Feed", story.get('story_title'), options]);
if (!options.immediate) {
clearTimeout(NEWSBLUR.reader.locks.scrolling);
NEWSBLUR.reader.flags.scrolling_by_selecting_story_title = true;