diff --git a/app/assets/javascripts/addTrack.js b/app/assets/javascripts/addTrack.js index 7cb18839c..f1674c0d2 100644 --- a/app/assets/javascripts/addTrack.js +++ b/app/assets/javascripts/addTrack.js @@ -138,9 +138,6 @@ saveTrack(); app.layout.closeDialog('add-track'); - - // refresh Session screen - sessionModel.refreshCurrentSession(); } function saveTrack() { @@ -167,8 +164,7 @@ data.sound = "stereo"; sessionModel.addTrack(sessionId, data); - var clientTrackId = context.jamClient.TrackSaveAssignments(); - console.log("clientTrackId=" + clientTrackId); + context.jamClient.TrackSaveAssignments(); } function validateSettings() { diff --git a/app/assets/javascripts/configureTrack.js b/app/assets/javascripts/configureTrack.js index d0186451a..ee2f6597c 100644 --- a/app/assets/javascripts/configureTrack.js +++ b/app/assets/javascripts/configureTrack.js @@ -206,11 +206,11 @@ }); }); - $('.voicechat-settings').click(function() { - // call this to initialize Music Audio tab - showMusicAudioPanel(true); - showVoiceChatPanel(true); - }); + // $('.voicechat-settings').click(function() { + // // call this to initialize Music Audio tab + // showMusicAudioPanel(true); + // showVoiceChatPanel(true); + // }); $('#audio-drivers').change(function() { audioDriverChanged(); @@ -612,7 +612,7 @@ function saveVoiceChatSettings() { currentVoiceChat = $('#voice-chat-device').val(); - //logger.debug("Calling TrackSetChatUsesMusic with value = " + currentVoiceChat); + logger.debug("Calling TrackSetChatUsesMusic with value = " + currentVoiceChat); context.jamClient.TrackSetChatUsesMusic(currentVoiceChat); // UNASSIGNED VOICE CHAT @@ -663,6 +663,8 @@ } } + logger.debug("myTrackCount=" + myTrackCount); + // if Track 2 exists, verify Input and Instrument exist if (isValid && myTrackCount > 1) { if ($('#track2-input > option').size() === 0 || $('#track2-input > option').size() > 2) { @@ -737,6 +739,7 @@ }); originalVoiceChat = context.jamClient.TrackGetChatUsesMusic(); + logger.debug("originalVoiceChat=" + originalVoiceChat); $('#voice-chat-device').val(originalVoiceChat); originalDeviceId = context.jamClient.TrackGetMusicDeviceID(); diff --git a/app/assets/javascripts/session.js b/app/assets/javascripts/session.js index 5551ad45a..dbd3e838c 100644 --- a/app/assets/javascripts/session.js +++ b/app/assets/javascripts/session.js @@ -413,11 +413,12 @@ }); }); + logger.debug("416-myTracks.length=" + myTracks.length); + configureTrackDialog = new context.JK.ConfigureTrackDialog(app, myTracks, sessionId, sessionModel); addTrackDialog = new context.JK.AddTrackDialog(app, myTracks, sessionId, sessionModel); addNewGearDialog = new context.JK.AddNewGearDialog(app); - // hide "Add Track" link if there are 2 tracks: // # NO LONGER HIDING ADD TRACK even when there are 2 tracks (VRFS-537) $('#div-add-track').click(function() { if (myTracks.length === 2) { @@ -639,6 +640,7 @@ function deleteTrack(evt) { var trackId = $(evt.currentTarget).attr("track-id"); sessionModel.deleteTrack(sessionId, trackId); + logger.debug("643-myTracks.length=" + myTracks.length); } function _toggleVisualMuteControl($control, muting) { diff --git a/app/assets/javascripts/sessionModel.js b/app/assets/javascripts/sessionModel.js index a2bd79db0..ddc008bea 100644 --- a/app/assets/javascripts/sessionModel.js +++ b/app/assets/javascripts/sessionModel.js @@ -254,6 +254,7 @@ processData:false, success: function(response) { logger.debug("Successfully added track (" + JSON.stringify(data) + ")"); + refreshCurrentSession(); }, error: ajaxError });