From 50ca857c3eda27c28cf6a8b2def83ab0e2608169 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sun, 10 Oct 2010 23:33:56 -0400
Subject: [PATCH] Forcing feed refresh on many common activities. Maybe this
 should happen more transparently for classifiers?

---
 media/js/newsblur/reader.js                | 8 ++++----
 media/js/newsblur/reader_classifier.js     | 8 ++++++--
 media/js/newsblur/reader_feed_exception.js | 2 +-
 media/js/newsblur/reader_manage_feed.js    | 5 +++--
 media/js/newsblur/reader_mark_read.js      | 2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js
index 0e40362e8..8c01a0e5c 100644
--- a/media/js/newsblur/reader.js
+++ b/media/js/newsblur/reader.js
@@ -2290,14 +2290,14 @@
                         $.make('div', { className: 'NB-menu-manage-image' }),
                         $.make('div', { className: 'NB-menu-manage-title' }, 'Mark as read')
                     ])),
-                    $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-stats' }, [
-                        $.make('div', { className: 'NB-menu-manage-image' }),
-                        $.make('div', { className: 'NB-menu-manage-title' }, 'Statistics')
-                    ]),
                     $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-reload' }, [
                         $.make('div', { className: 'NB-menu-manage-image' }),
                         $.make('div', { className: 'NB-menu-manage-title' }, 'Insta-fetch stories')
                     ]),
+                    $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-stats' }, [
+                        $.make('div', { className: 'NB-menu-manage-image' }),
+                        $.make('div', { className: 'NB-menu-manage-title' }, 'Statistics')
+                    ]),
                     $.make('li', { className: 'NB-menu-separator' }),
                     $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-train' }, [
                         $.make('div', { className: 'NB-menu-manage-image' }),
diff --git a/media/js/newsblur/reader_classifier.js b/media/js/newsblur/reader_classifier.js
index 4ea502635..8ac38d5a1 100644
--- a/media/js/newsblur/reader_classifier.js
+++ b/media/js/newsblur/reader_classifier.js
@@ -759,6 +759,7 @@ var classifier = {
     },
         
     save_publisher: function(keep_modal_open) {
+        var self = this;
         var $save = $('.NB-modal-submit-save', this.$modal);
         var data = this.serialize_classifier();
         
@@ -774,13 +775,15 @@ var classifier = {
         
         this.model.save_classifier_publisher(data, function() {
             if (!keep_modal_open) {
-                NEWSBLUR.reader.force_feed_refresh();
+                NEWSBLUR.reader.force_feeds_refresh();
+                NEWSBLUR.reader.load_feed(self.feed_id, null, true);
                 $.modal.close();
             }
         });
     },
     
     save_story: function() {
+        var self = this;
         var $save = $('.NB-modal-submit-save', this.$modal);
         var story_id = this.story_id;
         var data = this.serialize_classifier();
@@ -789,7 +792,8 @@ var classifier = {
         
         $save.text('Saving...').addClass('NB-disabled').attr('disabled', true);
         this.model.save_classifier_story(story_id, data, function() {
-            NEWSBLUR.reader.force_feed_refresh();
+            NEWSBLUR.reader.force_feeds_refresh();
+            NEWSBLUR.reader.open_feed(self.feed_id, null, true);
             $.modal.close();
         });
     }
diff --git a/media/js/newsblur/reader_feed_exception.js b/media/js/newsblur/reader_feed_exception.js
index efd7ff8ed..563f71c7e 100644
--- a/media/js/newsblur/reader_feed_exception.js
+++ b/media/js/newsblur/reader_feed_exception.js
@@ -172,7 +172,7 @@ NEWSBLUR.ReaderFeedException.prototype = {
         
         this.model.save_exception_retry(this.feed_id, function() {
             NEWSBLUR.reader.flags['has_unfetched_feeds'] = true;
-            NEWSBLUR.reader.force_feed_refresh();
+            NEWSBLUR.reader.force_feed_refresh(self.feed_id);
             $.modal.close();
         });
     },
diff --git a/media/js/newsblur/reader_manage_feed.js b/media/js/newsblur/reader_manage_feed.js
index fec246cb4..84dde9938 100644
--- a/media/js/newsblur/reader_manage_feed.js
+++ b/media/js/newsblur/reader_manage_feed.js
@@ -311,6 +311,7 @@ NEWSBLUR.ReaderManageFeed.prototype = {
     },
     
     save: function() {
+        var self = this;
         var $save = $('.NB-modal-submit-save', this.$manage);
         var data = this.serialize_classifier();
         
@@ -318,7 +319,7 @@ NEWSBLUR.ReaderManageFeed.prototype = {
         
         $save.text('Saving...').addClass('NB-disabled').attr('disabled', true);
         this.model.save_classifier_publisher(data, function() {
-            NEWSBLUR.reader.force_feed_refresh();
+            NEWSBLUR.reader.force_feed_refresh(self.feed_id);
             $.modal.close();
         });
     },
@@ -330,7 +331,7 @@ NEWSBLUR.ReaderManageFeed.prototype = {
         
         $('.NB-modal-submit-retry', this.$manage).addClass('NB-disabled').attr('value', 'Fetching...');
         this.model.save_exception_retry(this.feed_id, function() {
-            NEWSBLUR.reader.force_feed_refresh(function() {
+            NEWSBLUR.reader.force_feed_refresh(self.feed_id, function() {
               if (NEWSBLUR.reader.active_feed == self.feed_id) {
                 NEWSBLUR.reader.open_feed(self.feed_id, null, true);
               }
diff --git a/media/js/newsblur/reader_mark_read.js b/media/js/newsblur/reader_mark_read.js
index f57a55f92..f6d7d148d 100644
--- a/media/js/newsblur/reader_mark_read.js
+++ b/media/js/newsblur/reader_mark_read.js
@@ -120,7 +120,7 @@ NEWSBLUR.ReaderMarkRead.prototype = {
             this.model.save_mark_read(days, function() {
                 NEWSBLUR.reader.start_count_unreads_after_import();
                 $.modal.close();
-                NEWSBLUR.reader.force_feed_refresh(function() {
+                NEWSBLUR.reader.force_feeds_refresh(function() {
                     NEWSBLUR.reader.finish_count_unreads_after_import();
                 });
             });