From 4b53fbf9fac83f10c2759eae36aa04209bdbe394 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 7 Sep 2012 15:35:00 -0700
Subject: [PATCH] Adding folder story counts to content pane. Thanks to @afita
 for the suggestion.

---
 media/js/newsblur/reader/reader.js           | 26 ++++++++++++++------
 media/js/newsblur/views/folder_count_view.js | 14 +++++++++++
 media/js/newsblur/views/folder_view.js       |  4 ---
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js
index 79d480b36..c97341ab9 100644
--- a/media/js/newsblur/reader/reader.js
+++ b/media/js/newsblur/reader/reader.js
@@ -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);
diff --git a/media/js/newsblur/views/folder_count_view.js b/media/js/newsblur/views/folder_count_view.js
index 548b9f12f..2ee51eec4 100644
--- a/media/js/newsblur/views/folder_count_view.js
+++ b/media/js/newsblur/views/folder_count_view.js
@@ -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;
         
diff --git a/media/js/newsblur/views/folder_view.js b/media/js/newsblur/views/folder_view.js
index b07be6834..c77b10605 100644
--- a/media/js/newsblur/views/folder_view.js
+++ b/media/js/newsblur/views/folder_view.js
@@ -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() {