From 611b857accaf78b718f02c24cb7ecba322d976cd Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 9 Mar 2016 13:17:28 -0800
Subject: [PATCH] Fixing broken click handler for feed selector.

---
 media/js/newsblur/views/feed_selector.js   | 2 +-
 media/js/newsblur/views/feed_title_view.js | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/media/js/newsblur/views/feed_selector.js b/media/js/newsblur/views/feed_selector.js
index 97741eb8a..d9ef3d971 100644
--- a/media/js/newsblur/views/feed_selector.js
+++ b/media/js/newsblur/views/feed_selector.js
@@ -75,7 +75,7 @@ NEWSBLUR.Views.FeedSelector = Backbone.View.extend({
     filter_feed_selector: function(e) {
         var $input = this.$(".NB-feeds-selector-input");
         var input = $input.val().toLowerCase();
-        if (input == this.last_input) return;
+        if (input == this.last_input && input.length) return;
         this.last_input = input;
         
         this.selected_feeds.each(function(feed) {
diff --git a/media/js/newsblur/views/feed_title_view.js b/media/js/newsblur/views/feed_title_view.js
index 5622d275b..eef421c47 100644
--- a/media/js/newsblur/views/feed_title_view.js
+++ b/media/js/newsblur/views/feed_title_view.js
@@ -291,7 +291,7 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
     
     open: function(e, options) {
         options = options || {};
-        if (this.options.feed_chooser) return;
+        if (this.options.feed_chooser && !options.ignore_feed_selector) return;
         if (this.options.type != 'feed') return;
         if (e.which >= 2) return;
         if (e.which == 1 && $('.NB-menu-manage-container:visible').length) return;
@@ -307,7 +307,7 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
 
         e.preventDefault();
         e.stopPropagation();
-        
+
         if (this.model.get('has_exception') && this.model.get('exception_type') == 'feed') {
             NEWSBLUR.reader.open_feed_exception_modal(this.model.id);
         } else if (this.model.is_social()) {
@@ -324,6 +324,9 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
     },
     
     highlight_event: function(e) {
+        if (this.$el.hasClass('NB-feed-selector-active')) {
+            return this.open(e, {'ignore_feed_selector': true});
+        }
         return this.highlight();
     },