752177 - Adds clearing of search hash when search input is cleared

manually or via Clear from dropdown.
daviddavis · Jan 4, 2012 · fcbe755 · fcbe755
1 parent ec44693
commit fcbe755
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/public/javascripts/panel.js b/src/public/javascripts/panel.js
@@ -478,6 +478,11 @@ KT.panel = (function ($) {
                 }
                 else if (!refresh) {
                     closePanel();
+
+                    if( search_element.val() !== "" && search === undefined ){
+                        search_element.val('');
+                        $('#search_form').trigger('submit');
+                    }
                 }
             }
             return false;
@@ -722,7 +727,6 @@ KT.panel.list = (function () {
                             expand_list = $('.expand_list');
                         }
                         retrievingNewContent = false;
-                        console.log(data);
                         expand_list.append(data['html']);
                         $('.list-spinner').remove();
                         if (data['current_items'] === 0) {
@@ -852,6 +856,15 @@ KT.panel.list = (function () {
                     }
                 });
             });
+
+            $('#search').live('change', function(){
+                var value = $(this).val();
+
+                if( value === "" ){
+                    $.bbq.removeState("search");
+                    $('#search_form').trigger('submit');
+                }
+            });
         };
     return {
         set_extended_cb	: function (callBack) { extended_cb = callBack; },

diff --git a/src/public/javascripts/search.js b/src/public/javascripts/search.js
@@ -61,8 +61,12 @@ var favorite = (function() {
             client_common.destroy(url, favorite.success, favorite.error);
         },
         clear : function(data){
-        	$('#search').val('');
-        	$('#search_form').submit();
+            var search_form = $('#search_form'),
+                search_input = search_form.find('#search');
+
+            search_input.val('');
+            search_input.change();
+       	    $('#search_form').submit();
         	$('.qdropdown').hide();
         }
     }
@@ -132,4 +136,4 @@ KT.search = (function($){
 		enableAutoComplete	: enableAutoComplete	
 	};
 
-})(jQuery);
+})(jQuery);