From 5b162d0707f5c2bbf822b810fcf1bfd86cc09e5c Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 15 Oct 2010 18:38:49 -0400
Subject: [PATCH] Fixing race condition for showing the feed chooser modal on
 OPML import.

---
 media/css/reader.css                    | 6 +++++-
 media/js/newsblur/reader.js             | 3 +--
 media/js/newsblur/reader_feedchooser.js | 6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/media/css/reader.css b/media/css/reader.css
index f23fd8d7c..8d4cf1801 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -394,7 +394,11 @@ a img {
 }
 
 .NB-feedlist .feed.NB-feed-exception {
-    background-color: #F7EDC6;
+/*    background-color: #F7EDC6;*/
+  
+}
+.NB-feedlist .feed.NB-feed-exception .feed_title {
+  color: #A0A0A0;
 }
 
 #feed_list.NB-feedlist .feed.NB-feed-inactive {
diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js
index 9c7fac3c7..169ee52d4 100644
--- a/media/js/newsblur/reader.js
+++ b/media/js/newsblur/reader.js
@@ -575,7 +575,7 @@
                 $('.feed', $feed_list).tsort('.feed_title');
                 $('.folder', $feed_list).tsort('.folder_title_text');
             }
-            
+
             if (NEWSBLUR.Globals.is_authenticated && this.flags['has_chosen_feeds']) {
                 this.start_count_unreads_after_import();
                 this.force_feeds_refresh($.rescope(this.finish_count_unreads_after_import, this));
@@ -591,7 +591,6 @@
           var has_chosen_feeds = _.any(feeds, function(feed) {
             return feed.active;
           });
-          
           return has_chosen_feeds;
         },
         
diff --git a/media/js/newsblur/reader_feedchooser.js b/media/js/newsblur/reader_feedchooser.js
index eb750e9d3..a63b03447 100644
--- a/media/js/newsblur/reader_feedchooser.js
+++ b/media/js/newsblur/reader_feedchooser.js
@@ -1,6 +1,6 @@
 NEWSBLUR.ReaderFeedchooser = function(options) {
     var defaults = {};
-    
+
     this.options = $.extend({}, defaults, options);
     this.model = NEWSBLUR.AssetModel.reader();
     this.runner();
@@ -13,7 +13,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
         this.MAX_FEEDS = 40;
         this.approve_list = [];
         this.make_modal();
-        this.open_modal();
+        _.defer(_.bind(function() { this.open_modal(); }, this));
         this.find_feeds_in_feed_list();
         this.initial_load_feeds();
         
@@ -132,7 +132,6 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
     resize_modal: function(previous_height) {
         var height = this.$modal.height() + 24;
         var parent_height = this.$modal.parent().height();
-        NEWSBLUR.log(['resize', $('#NB-feedchooser-feeds').height(), height, parent_height]);
         if (height > parent_height && previous_height != height) {
             var chooser_height = $('#NB-feedchooser-feeds').height();
             var diff = Math.max(4, height - parent_height);
@@ -143,7 +142,6 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
     
     open_modal: function() {
         var self = this;
-        
         this.$modal.modal({
             'minWidth': 750,
             'maxWidth': 750,