diff --git a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js index 972badf3e..201e1cc9f 100644 --- a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js +++ b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js @@ -50,7 +50,7 @@ logger.error("unable to open recording due to all missing tracks: %o", localResults); app.notify({ title: "Unable to Open Recording for Playback", - text: "All tracks associated with the recording are missing", + text: "All of your tracks associated with the recording are missing. This is a bug in the application.", icon_url: "/assets/content/icon_alert_big.png" }); } @@ -58,7 +58,7 @@ logger.error("unable to open recording due to some missing tracks: %o", localResults); app.notify({ title: "Unable to Open Recording for Playback", - text: "Some tracks associated with the recording are missing", + text: "Some of your tracks associated with the recording are missing. This is a bug in the application.", icon_url: "/assets/content/icon_alert_big.png" }) } diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js index 9a4658d6b..936ecd116 100644 --- a/web/app/assets/javascripts/jam_rest.js +++ b/web/app/assets/javascripts/jam_rest.js @@ -1059,7 +1059,7 @@ }) } - function putTrackSyncChange(options) { + function putTrackSyncChange(options) { var musicSessionId = options["id"] delete options["id"]; diff --git a/web/app/assets/javascripts/sessionModel.js b/web/app/assets/javascripts/sessionModel.js index 220ce9ec1..c147007b2 100644 --- a/web/app/assets/javascripts/sessionModel.js +++ b/web/app/assets/javascripts/sessionModel.js @@ -35,7 +35,7 @@ server.registerOnSocketClosed(onWebsocketDisconnected); function id() { - return currentSession ? currentSession.id : null; + return currentSessionId; } function start(sessionId) { @@ -536,6 +536,7 @@ // so we need to check that we actaully have userTracks before considering ourselves done var inputTracks = context.JK.TrackHelpers.getUserTracks(context.jamClient); if(inputTracks.length > 0) { + logger.debug("obtained tracks at start of session") sessionPageEnterDeferred.resolve(inputTracks); sessionPageEnterDeferred = null; } @@ -550,7 +551,7 @@ backendMixerAlertThrottleTimer = setTimeout(function() { // this is a local change to our tracks. we need to tell the server about our updated track information var inputTracks = context.JK.TrackHelpers.getUserTracks(context.jamClient); - + // create a trackSync request based on backend data var syncTrackRequest = {}; syncTrackRequest.client_id = app.clientId;