diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js
index 16742bafe..cdd36acb0 100644
--- a/web/app/assets/javascripts/findMusician.js
+++ b/web/app/assets/javascripts/findMusician.js
@@ -1,15 +1,15 @@
(function(context,$) {
- "use strict";
+ "use strict";
- context.JK = context.JK || {};
- context.JK.FindMusicianScreen = function(app) {
+ context.JK = context.JK || {};
+ context.JK.FindMusicianScreen = function(app) {
var logger = context.JK.logger;
var musicians = {};
var musicianList;
var instrument_logo_map = context.JK.getInstrumentIconMap24();
- var did_show_musician_page = false;
- var page_num=1, page_count=0;
+ var did_show_musician_page = false;
+ var page_num=1, page_count=0;
function loadMusicians(queryString) {
// squelch nulls and undefines
@@ -24,157 +24,165 @@
}
function search() {
- did_show_musician_page = true;
+ did_show_musician_page = true;
var queryString = 'srch_m=1&page='+page_num+'&';
// order by
- var orderby = $('#musician_order_by').val();
+ var orderby = $('#musician_order_by').val();
if (typeof orderby != 'undefined' && orderby.length > 0) {
queryString += "orderby=" + orderby + '&';
}
+
// instrument filter
- var instrument = $('#musician_instrument').val();
+ var instrument = $('#musician_instrument').val();
if (typeof instrument != 'undefined' && !(instrument === '')) {
queryString += "instrument=" + instrument + '&';
}
+
// distance filter
var query_param = $('#musician_query_distance').val();
if (query_param !== null && query_param.length > 0) {
- var matches = query_param.match(/(\d+)/);
- if (0 < matches.length) {
- var distance = matches[0];
- queryString += "distance=" + distance + '&';
- }
+ var matches = query_param.match(/(\d+)/);
+ if (0 < matches.length) {
+ var distance = matches[0];
+ queryString += "distance=" + distance + '&';
+ }
}
loadMusicians(queryString);
}
function refreshDisplay() {
- clearResults();
- search();
+ clearResults();
+ search();
}
function afterLoadMusicians(mList) {
// display the 'no musicians' banner if appropriate
var $noMusiciansFound = $('#musicians-none-found');
- musicianList = mList;
+ musicianList = mList;
if(musicianList.length == 0) {
$noMusiciansFound.show();
- musicians = [];
- } else {
+ musicians = [];
+ }
+ else {
$noMusiciansFound.hide();
- musicians = musicianList['musicians'];
- if (!(typeof musicians === 'undefined')) {
- $('#musician-filter-city').text(musicianList['city']);
- if (0 == page_count) {
- page_count = musicianList['page_count'];
- }
- renderMusicians();
- }
+ musicians = musicianList['musicians'];
+ if (!(typeof musicians === 'undefined')) {
+ $('#musician-filter-city').text(musicianList['city']);
+ if (0 == page_count) {
+ page_count = musicianList['page_count'];
+ }
+ renderMusicians();
+ }
}
}
- /**
- * Render a list of musicians
- */
function renderMusicians() {
var ii, len;
- var mTemplate = $('#template-find-musician-row').html();
- var fTemplate = $('#template-musician-follow-info').html();
- var aTemplate = $('#template-musician-action-btns').html();
- var mVals, mm, renderings='';
- var instr_logos, instr;
- var follows, followVals, aFollow;
-
- for (ii=0, len=musicians.length; ii < len; ii++) {
- mm = musicians[ii];
- instr_logos = '';
- for (var jj=0, ilen=mm['instruments'].length; jj ';
- }
- follows = '';
- followVals = {};
- for (var jj=0, ilen=mm['followings'].length; jj= $(this)[0].scrollHeight) {
- if (page_num < page_count) {
- page_num += 1;
- search();
- }
+ if (page_num < page_count) {
+ page_num += 1;
+ search();
+ }
}
});
}
- /**
- * Initialize,
- */
function initialize() {
var screenBindings = {
'beforeShow': beforeShow,
@@ -231,5 +236,4 @@
return this;
};
-
})(window,jQuery);
diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js
index e0d281fe6..00273a333 100644
--- a/web/app/assets/javascripts/profile.js
+++ b/web/app/assets/javascripts/profile.js
@@ -375,12 +375,6 @@
$('.profile-nav a.active').removeClass('active');
$('.profile-nav a.#profile-social-link').addClass('active');
- /*if (isMusician()) {
- $('.profile-social-left').show();
- } else {
- $('.profile-social-left').hide();
- }*/
-
bindSocial();
}