VRFS-1012 Fix band profile navigation.
This commit is contained in:
Daniel Weigh
parent
0d675b16dc
commit
77e7b60ca5
|
|
@ -192,7 +192,7 @@
|
|||
if (bandId.length === 0) {
|
||||
rest.createBand(band).done(function(response) {
|
||||
createBandInvitations(response.id, function() {
|
||||
context.location = "#/bandProfile/" + response.id;
|
||||
context.location = "/client#/bandProfile/" + response.id;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
band.id = bandId;
|
||||
rest.updateBand(band).done(function(response) {
|
||||
createBandInvitations(band.id, function() {
|
||||
context.location = "#/bandProfile/" + band.id;
|
||||
context.location = "/client#/bandProfile/" + band.id;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -473,7 +473,7 @@
|
|||
|
||||
$('#btn-band-setup-cancel').click(function() {
|
||||
resetForm();
|
||||
context.location = "#/home";
|
||||
context.location = "/client#/home";
|
||||
});
|
||||
|
||||
$('#btn-band-setup-next').click(function() {
|
||||
|
|
@ -510,7 +510,7 @@
|
|||
$('#band-change-photo').click(function(evt) {
|
||||
evt.stopPropagation();
|
||||
$("#hdn-band-id").val(bandId);
|
||||
context.location = '#/band/setup/photo';
|
||||
context.location = '/client#/band/setup/photo';
|
||||
return false;
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
bandId = $("#hdn-band-id").val();
|
||||
logger.debug("bandId=" + bandId);
|
||||
if (!bandId) {
|
||||
context.location = '#/home';
|
||||
context.location = '/client#/home';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
function navToEditProfile() {
|
||||
resetForm();
|
||||
$("#hdn-band-id").val(bandId);
|
||||
context.location = '#/band/setup';
|
||||
context.location = '/client#/band/setup';
|
||||
}
|
||||
|
||||
function renderBandPhotoSpinner() {
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@
|
|||
success: function(response) {
|
||||
var newSessionId = response.id;
|
||||
var invitationCount = inviteMusiciansUtil.createInvitations(newSessionId, function() {
|
||||
context.location = '#/session/' + newSessionId;
|
||||
context.location = '/client#/session/' + newSessionId;
|
||||
});
|
||||
// Re-loading the session settings will cause the form to reset with the right stuff in it.
|
||||
// This is an extra xhr call, but it keeps things to a single codepath
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@
|
|||
players += context.JK.fillTemplate(pTemplate, playerVals);
|
||||
}
|
||||
var actionVals = {
|
||||
profile_url: "/#/profile/" + bb.id,
|
||||
profile_url: "/client#/bandProfile/" + bb.id,
|
||||
button_follow: bb['is_following'] ? '' : 'button-orange',
|
||||
button_message: 'button-orange'
|
||||
};
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
|
||||
bVals = {
|
||||
avatar_url: context.JK.resolveAvatarUrl(bb.photo_url),
|
||||
profile_url: "/client#/profile/" + bb.id,
|
||||
profile_url: "/client#/bandProfile/" + bb.id,
|
||||
band_name: bb.name,
|
||||
band_location: bb.city + ', ' + bb.state,
|
||||
genres: bgenres,
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@
|
|||
hash = null;
|
||||
}
|
||||
|
||||
var url = '#/home';
|
||||
var url = '/client#/home';
|
||||
if (hash) {
|
||||
url = hash;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@
|
|||
var destination = $(evt.currentTarget).attr('layout-link');
|
||||
var destinationType = $('[layout-id="' + destination + '"]').attr("layout");
|
||||
if (destinationType === "screen") {
|
||||
context.location = '#/' + destination;
|
||||
context.location = '/client#/' + destination;
|
||||
} else if (destinationType === "dialog") {
|
||||
showDialog(destination);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
$('#search-results').empty();
|
||||
var query = $('#search-input').val();
|
||||
if (query) {
|
||||
context.location = '#/searchResults/:' + query;
|
||||
context.location = '/client#/searchResults/:' + query;
|
||||
} else {
|
||||
query = $('#query').html();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@
|
|||
.fail(function(xhr, textStatus, errorMessage) {
|
||||
if(xhr.status == 404) {
|
||||
// we tried to join the session, but it's already gone. kick user back to join session screen
|
||||
context.window.location = "#/findSession";
|
||||
context.window.location = "/client#/findSession";
|
||||
app.notify(
|
||||
{ title: "Unable to Join Session",
|
||||
text: "The session you attempted to join is over."
|
||||
|
|
@ -778,7 +778,7 @@
|
|||
}
|
||||
|
||||
function ftueCallback() {
|
||||
context.location = "#/home";
|
||||
context.location = "/client#/home";
|
||||
app.layout.showDialog('ftue');
|
||||
}
|
||||
|
||||
|
|
@ -1009,7 +1009,7 @@
|
|||
type: "DELETE",
|
||||
url: "/api/sessions/" + sessionId,
|
||||
success: function(response) {
|
||||
context.location="#/home";
|
||||
context.location="/client#/home";
|
||||
},
|
||||
error: function(jqXHR, textStatus, errorThrown) {
|
||||
logger.error("Error deleting session " + sessionId);
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@
|
|||
}
|
||||
|
||||
function onTermsAccepted(sessionId) {
|
||||
context.location = '#/session/' + sessionId;
|
||||
context.location = '/client#/session/' + sessionId;
|
||||
}
|
||||
|
||||
function events() {
|
||||
|
|
|
|||
|
|
@ -585,7 +585,7 @@
|
|||
|
||||
function onTermsAccepted(args) {
|
||||
deleteNotification(args.notification_id);
|
||||
context.location = '#/session/' + args.session_id;
|
||||
context.location = '/client#/session/' + args.session_id;
|
||||
}
|
||||
|
||||
function registerSessionEnded() {
|
||||
|
|
@ -739,7 +739,7 @@
|
|||
|
||||
function listenToSession(args) {
|
||||
deleteNotification(args.notification_id);
|
||||
context.location = '#/session/' + args.session_id;
|
||||
context.location = '/client#/session/' + args.session_id;
|
||||
}
|
||||
|
||||
function registerMusicianRecordingSaved() {
|
||||
|
|
@ -785,7 +785,7 @@
|
|||
|
||||
function listenToRecording(args) {
|
||||
deleteNotification(args.notification_id);
|
||||
context.location = '#/recording/' + args.recording_id;
|
||||
context.location = '/client#/recording/' + args.recording_id;
|
||||
}
|
||||
|
||||
function registerRecordingStarted() {
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
-->
|
||||
<!-- <div class="left mr20">
|
||||
<div class="left">
|
||||
<a href="/#/createSession" title="This feature is not yet available.">
|
||||
<a href="/client#/createSession" title="This feature is not yet available.">
|
||||
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
</div>
|
||||
<!-- <div class="left mr20">
|
||||
<div class="left">
|
||||
<a href="/#/createSession" title="This feature is not yet available.">
|
||||
<a href="/client#/createSession" title="This feature is not yet available.">
|
||||
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<input id="session-keyword-srch" type="text" name="search" placeholder="Search by Keyword" />
|
||||
</div>
|
||||
<div class="right mr10">
|
||||
<a id="btn-refresh" href="#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
|
||||
<a id="btn-refresh" href="/client#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
<h1>JamKazam</h1>
|
||||
<div class="search">
|
||||
<a href="/#/testBridge">Test Bridge</a><br/>
|
||||
<a href="/client#/testBridge">Test Bridge</a><br/>
|
||||
<input type="text" class="searchtextinput" placeholder="Search for Bands, Musicians and Fans"/>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -127,13 +127,13 @@
|
|||
<script type="text/template" id="template-no-bands">
|
||||
<div class="when-empty">
|
||||
Not In Any Bands:<br/>
|
||||
<a id="band-setup-link" href="#/band/setup">Set Up Your Band</a>
|
||||
<a id="band-setup-link" href="/client#/band/setup">Set Up Your Band</a>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/template" id="template-more-bands">
|
||||
<div class="when-empty">
|
||||
<a id="band-setup-link" href="#/band/setup">Set Up Another Band</a>
|
||||
<a id="band-setup-link" href="/client#/band/setup">Set Up Another Band</a>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
</div>
|
||||
|
||||
<!-- Leave Button -->
|
||||
<a class="button-grey right leave" href="#/home" id="session-leave">X LEAVE</a>
|
||||
<a class="button-grey right leave" href="/client#/home" id="session-leave">X LEAVE</a>
|
||||
</div>
|
||||
<!-- end session controls -->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue