From cf429395089b9f424414fe5c59338c6b74ec05ce Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Fri, 2 Dec 2011 11:27:40 -0800 Subject: [PATCH] bug 12089 Fix search button click causing list view to be populated twice --- ui/scripts/ui/widgets/listView.js | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 40dbd5ac62f..09d03277fa3 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -1090,16 +1090,7 @@ return true; }); - // Setup filter events - $listView.find('.button.search, select, input[type=text]').bind('click change', function(event) { - if ($(event.target).closest('.section-select').size()) return true; - if ((event.type == 'click' || - event.type == 'mouseup') && - ($(event.target).is('select') || - $(event.target).is('option') || - $(event.target).is('input'))) - return true; - + var search = function() { loadBody( $table, listViewData.dataProvider, @@ -1108,7 +1099,7 @@ { page: 1, filterBy: { - kind: $listView.find('select[id=filterBy]').val(), + kind: $listView.find('select[id=filterBy]').val(), search: { value: $listView.find('input[type=text]').val(), by: 'name' @@ -1120,6 +1111,23 @@ context: $listView.data('view-args').context } ); + }; + + $listView.find('.search-bar input[type=text]').change(function(event) { + search(); + }); + + // Setup filter events + $listView.find('.button.search, select').bind('change', function(event) { + if ($(event.target).closest('.section-select').size()) return true; + if ((event.type == 'click' || + event.type == 'mouseup') && + ($(event.target).is('select') || + $(event.target).is('option') || + $(event.target).is('input'))) + return true; + + search(); return true; });