seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

vrfs988: refresh both sidebar and searchResults when search params changed

This commit is contained in:
Jonathan Kolyer 2014-01-12 02:02:15 -06:00
parent ddd1b93420
commit af4f03c91e
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/app/assets/javascripts/searchResults.js
View File

@ -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.)

6
web/app/assets/javascripts/sidebar.js
View File

@ -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();