From 77e7b60ca55a85ded704ddc595342359b26bfa3d Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Thu, 6 Feb 2014 08:03:44 -0500 Subject: [PATCH] VRFS-1012 Fix band profile navigation. --- web/app/assets/javascripts/band_setup.js | 8 ++++---- web/app/assets/javascripts/band_setup_photo.js | 4 ++-- web/app/assets/javascripts/createSession.js | 2 +- web/app/assets/javascripts/findBand.js | 4 ++-- web/app/assets/javascripts/jamkazam.js | 2 +- web/app/assets/javascripts/layout.js | 2 +- web/app/assets/javascripts/searchResults.js | 2 +- web/app/assets/javascripts/session.js | 6 +++--- web/app/assets/javascripts/sessionList.js | 2 +- web/app/assets/javascripts/sidebar.js | 6 +++--- web/app/views/clients/_band_setup.html.erb | 2 +- web/app/views/clients/_createSession.html.erb | 2 +- web/app/views/clients/_findSession.html.erb | 2 +- web/app/views/clients/_header.html.erb | 2 +- web/app/views/clients/_profile.html.erb | 4 ++-- web/app/views/clients/_session.html.erb | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/web/app/assets/javascripts/band_setup.js b/web/app/assets/javascripts/band_setup.js index 9ab0aafe7..0e861c06a 100644 --- a/web/app/assets/javascripts/band_setup.js +++ b/web/app/assets/javascripts/band_setup.js @@ -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; }); diff --git a/web/app/assets/javascripts/band_setup_photo.js b/web/app/assets/javascripts/band_setup_photo.js index f5775cee5..f19ea4015 100644 --- a/web/app/assets/javascripts/band_setup_photo.js +++ b/web/app/assets/javascripts/band_setup_photo.js @@ -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() { diff --git a/web/app/assets/javascripts/createSession.js b/web/app/assets/javascripts/createSession.js index 2d2c58f10..84dc981df 100644 --- a/web/app/assets/javascripts/createSession.js +++ b/web/app/assets/javascripts/createSession.js @@ -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 diff --git a/web/app/assets/javascripts/findBand.js b/web/app/assets/javascripts/findBand.js index 4bef37525..3209915e3 100644 --- a/web/app/assets/javascripts/findBand.js +++ b/web/app/assets/javascripts/findBand.js @@ -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, diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js index fba55b8f8..fbee40c0c 100644 --- a/web/app/assets/javascripts/jamkazam.js +++ b/web/app/assets/javascripts/jamkazam.js @@ -328,7 +328,7 @@ hash = null; } - var url = '#/home'; + var url = '/client#/home'; if (hash) { url = hash; } diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 53bac88fa..70e6cbc91 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -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); } diff --git a/web/app/assets/javascripts/searchResults.js b/web/app/assets/javascripts/searchResults.js index 7795f4076..9144d9943 100644 --- a/web/app/assets/javascripts/searchResults.js +++ b/web/app/assets/javascripts/searchResults.js @@ -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(); } diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index d85a15b30..a451a8189 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -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); diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js index 0a3fc572f..54da537c0 100644 --- a/web/app/assets/javascripts/sessionList.js +++ b/web/app/assets/javascripts/sessionList.js @@ -249,7 +249,7 @@ } function onTermsAccepted(sessionId) { - context.location = '#/session/' + sessionId; + context.location = '/client#/session/' + sessionId; } function events() { diff --git a/web/app/assets/javascripts/sidebar.js b/web/app/assets/javascripts/sidebar.js index f946c6149..fd95d09e0 100644 --- a/web/app/assets/javascripts/sidebar.js +++ b/web/app/assets/javascripts/sidebar.js @@ -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() { diff --git a/web/app/views/clients/_band_setup.html.erb b/web/app/views/clients/_band_setup.html.erb index 86bc29922..2fcb3514e 100644 --- a/web/app/views/clients/_band_setup.html.erb +++ b/web/app/views/clients/_band_setup.html.erb @@ -106,7 +106,7 @@ --> - X  LEAVE + X  LEAVE