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

Adding folder story counts to content pane. Thanks to @afita for the suggestion.

Browse source
This commit is contained in:
Samuel Clay 2012-09-07 15:35:00 -07:00
parent 1785eaad81
commit 4b53fbf9fa
3 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@
this.locks.scrolling = _.delay(_.bind(function() {
this.flags.scrolling_by_selecting_story_title = false;
}, this), 1000);
this.make_content_pane_feed_counter();
this.make_story_titles_pane_counter();
this.position_mouse_indicator();
this.switch_taskbar_view(view, {
@ -1128,7 +1128,7 @@
this.show_next_story(1);
}
this.make_content_pane_feed_counter(feed_id);
this.make_story_titles_pane_counter();
}
this.hide_stories_progress_bar();
if (this.flags['showing_feed_in_tryfeed_view']) {
@ -1336,6 +1336,9 @@
this.select_story_in_feed();
}
this.hide_stories_progress_bar();
if (first_load) {
this.make_story_titles_pane_counter();
}
}
},
@ -1930,17 +1933,26 @@
// = Story Titles Pane =
// =====================
make_content_pane_feed_counter: function(feed_id) {
make_story_titles_pane_counter: function() {
var $content_pane = this.$s.$content_pane;
feed_id = feed_id || this.active_feed;
feed_id = this.active_feed;
if (!feed_id) return;
var feed = this.model.get_feed(feed_id);
if (!feed) return;
if (this.flags['river_view']) {
var folder = this.active_folder;
} else {
var feed = this.model.get_feed(feed_id);
}
if (!feed && !folder) return;
if (NEWSBLUR.app.story_unread_counter) {
NEWSBLUR.app.story_unread_counter.remove();
}
NEWSBLUR.app.story_unread_counter = new NEWSBLUR.Views.FeedCount({model: feed}).render();
if (feed) {
NEWSBLUR.app.story_unread_counter = new NEWSBLUR.Views.FeedCount({model: feed}).render();
} else if (folder) {
NEWSBLUR.app.story_unread_counter = new NEWSBLUR.Views.FolderCount({collection: folder.folder_view.collection}).render();
}
NEWSBLUR.app.story_unread_counter.$el.css({'opacity': 0});
this.$s.$story_taskbar.append(NEWSBLUR.app.story_unread_counter.$el);

14
media/js/newsblur/views/folder_count_view.js
View file

@ -2,6 +2,13 @@ NEWSBLUR.Views.FolderCount = Backbone.View.extend({
className: 'feed_counts_floater',
initialize: function() {
_.bindAll(this, 'render');
if (!this.options.stale) {
this.collection.bind('change:counts', this.render);
}
},
// ==========
// = Render =
// ==========
@ -48,6 +55,13 @@ NEWSBLUR.Views.FolderCount = Backbone.View.extend({
// = Actions =
// ===========
center: function() {
var i_width = this.$el.width();
var o_width = NEWSBLUR.reader.$s.$story_taskbar.width();
var left = (o_width / 2.0) - (i_width / 2.0);
this.$el.css({'left': left});
},
flash: function() {
var $floater = this.$el;

4
media/js/newsblur/views/folder_view.js
View file

@ -31,10 +31,6 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
this.model.bind('delete', this.delete_folder);
this.model.folder_view = this;
}
if (this.collection && !this.options.feed_chooser) {
this.collection.bind('change:counts', this.check_collapsed);
}
},
destroy: function() {