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

VRFS-614 remove remaining async=false lines

This commit is contained in:
Brian Smith 2014-03-04 22:12:44 -05:00
parent 87b6654f28
commit 64824d3587
2 changed files with 80 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
web/app/assets/javascripts/bandProfile.js
View File

@ -238,31 +238,34 @@
}
function bindSocial() {
// FOLLOWERS
var url = "/api/bands/" + bandId + "/followers";
$.ajax({
type: "GET",
dataType: "json",
url: url,
async: false,
processData:false,
success: function(response) {
$.each(response, function(index, val) {
var template = $('#template-band-profile-social').html();
var followerHtml = context.JK.fillTemplate(template, {
userId: val.id,
hoverAction: val.musician ? "musician" : "fan",
avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
userName: val.name,
location: val.location
});
$('#band-profile-social-followers').append(followerHtml);
});
},
error: app.ajaxError
rest.getBandFollowers(bandId)
.done(function(response) {
$.each(response, function(index, val) {
var template = $('#template-band-profile-social').html();
var followerHtml = context.JK.fillTemplate(template, {
userId: val.id,
hoverAction: val.musician ? "musician" : "fan",
avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
userName: val.name,
location: val.location
});
$('#band-profile-social-followers').append(followerHtml);
if (index === response.length-1) {
context.JK.bindHoverEvents();
}
})
})
.fail(function(xhr) {
if(xhr.status >= 500) {
context.JK.fetchUserNetworkOrServerFailure();
}
else {
context.JK.app.ajaxError(arguments);
}
});
context.JK.bindHoverEvents();
}
/****************** HISTORY TAB *****************/
@ -298,39 +301,38 @@
}
function bindMembers() {
var url = "/api/bands/" + bandId + "/musicians";
$.ajax({
type: "GET",
dataType: "json",
url: url,
async: false,
processData:false,
success: function(response) {
bindMusicians(response);
},
error: app.ajaxError
});
if (isMember) {
rest.getBandMembers(bandId, false)
.done(function(response) {
bindMusicians(response);
if (isMember) {
bindPendingMembers();
}
}
})
.fail(function(xhr) {
if(xhr.status >= 500) {
context.JK.fetchUserNetworkOrServerFailure();
}
else {
context.JK.app.ajaxError(arguments);
}
});
}
function bindPendingMembers() {
var url = "/api/bands/" + bandId + "/musicians?pending=true";
$.ajax({
type: "GET",
dataType: "json",
url: url,
async: false,
processData:false,
success: function(response) {
if (response && response.length > 0) {
$("#band-profile-members").append("<br/><br/><h2><b>Pending Band Invitations</b></h2>");
bindMusicians(response);
}
},
error: app.ajaxError
rest.getBandMembers(bandId, true)
.done(function(response) {
if (response && response.length > 0) {
$("#band-profile-members").append("<br/><br/><h2><b>Pending Band Invitations</b></h2>");
bindMusicians(response);
}
})
.fail(function(xhr) {
if(xhr.status >= 500) {
context.JK.fetchUserNetworkOrServerFailure();
}
else {
context.JK.app.ajaxError(arguments);
}
});
}

27
web/app/assets/javascripts/jam_rest.js
View File

@ -204,11 +204,25 @@
type: "DELETE",
dataType: "json",
url: url,
async: false,
processData:false
});
}
function getBandMembers(bandId, hasPendingInvitation) {
var url = "/api/bands/" + bandId + "/musicians";
if (hasPendingInvitation) {
url += "?pending=true";
}
return $.ajax({
type: "GET",
dataType: "json",
url: url,
processData:false
});
}
function getSession(id) {
var url = "/api/sessions/" + id;
return $.ajax({
@ -518,6 +532,15 @@
});
}
function getBandFollowers(bandId) {
return $.ajax({
type: "GET",
dataType: "json",
url: "/api/bands/" + bandId + "/bands",
processData:false
});
}
function getClientDownloads(options) {
return $.ajax({
@ -874,6 +897,7 @@
this.getFollowings = getFollowings;
this.getFollowers = getFollowers;
this.getBands = getBands;
this.getBandFollowers = getBandFollowers;
this.updateSession = updateSession;
this.getSessionHistory = getSessionHistory;
this.addSessionComment = addSessionComment;
@ -916,6 +940,7 @@
this.createBandInvitation = createBandInvitation;
this.updateBandInvitation = updateBandInvitation;
this.removeBandMember = removeBandMember;
this.getBandMembers = getBandMembers;
this.login = login;
this.getShareSession = getShareSession;
this.getShareRecording = getShareRecording;