diff --git a/web/app/assets/javascripts/searchResults.js b/web/app/assets/javascripts/searchResults.js index 4ecb04b45..4d5248b73 100644 --- a/web/app/assets/javascripts/searchResults.js +++ b/web/app/assets/javascripts/searchResults.js @@ -52,7 +52,7 @@ if (query !== '') { $('#query').html(query); query += '&search_text_type='+selectedSearchType(); - context.JK.search(query, app, onSearchSuccess); + context.JK.search(query, app, context.JK.SearchResultScreen.onSearchSuccess); } else { $('#result-count').html(''); $('#query').html(''); @@ -61,14 +61,6 @@ return false; } - context.JK.SearchResultScreen.onSearchSuccess = function(response) { - searchResults(response, true) - searchResults(response, false) - } - function onSearchSuccess(response) { - context.JK.SearchResultScreen.searchResults(response, false) - } - function resultDivVisibility(val, isSidebar) { if (isSidebar) { $('div[layout=sidebar user-id=' + val.id + '].sidebar-search-connected').hide(); @@ -79,9 +71,17 @@ } } - context.JK.SearchResultScreen.searchResults = function(response, isSidebar) { + context.JK.SearchResultScreen.onSearchSuccess = function(response) { + searchResults(response, true) + searchResults(response, false) + } + + function searchResults(response, isSidebar) { var resultCount=0; var selector; + selector = isSidebar ? '#sidebar-search-results' : '#search-results'; + $(selector).html(''); + if (response.search_type === 'musicians') { resultCount = response.musicians.length; // TODO: generalize this for each search result type (band, musician, et. al.) diff --git a/web/app/assets/javascripts/sidebar.js b/web/app/assets/javascripts/sidebar.js index e570a5b52..de22418e7 100644 --- a/web/app/assets/javascripts/sidebar.js +++ b/web/app/assets/javascripts/sidebar.js @@ -266,14 +266,10 @@ function search(query) { logger.debug('query=' + query); if (query !== '') { - context.JK.search(query, app, onSearchSuccess); + context.JK.search(query, app, context.JK.SearchResultScreen.onSearchSuccess); } } - function onSearchSuccess(response) { - context.JK.SearchResultScreen.searchResults(response, true) - } - context.JK.Sidebar.getHeight = function() { // TODO: refactor this - copied from layout.js var sidebarHeight = $(context).height() - 75 - 2 * 60 + $('[layout-sidebar-expander]').height();