diff --git a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js index 9cd5c2ab8..d350841e8 100644 --- a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js +++ b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js @@ -115,9 +115,15 @@ if(recording && recording.video) { var name = $('#recording-finished-dialog form input[name=name]').val(); name = name.replace(/[^A-Za-z0-9\-\ ]/g, ''); - var keep = $('#recording-finished-dialog form input[name=save_video]').is(':checked') - logger.debug("VideoDecision rid:" + recording.id + ", name=" + name + ", keep=" + keep) - context.jamClient.VideoDecision(recording.id, name, keep) + + + var saveToDisk = $('#recording-finished-dialog form input[name=save_video]').is(':checked') + var keepResult = $dialog.data('result'); + keepResult = keepResult && keepResult.keep + + logger.debug("VideoDecision rid:" + recording.id + ", name=" + name + ", keepResult=" + keepResult + ", saveToDisk=" + saveToDisk); + + context.jamClient.VideoDecision(recording.id, name, keepResult && saveToDisk) } recording = null; @@ -217,7 +223,7 @@ app.layout.closeDialog('recordingFinished'); context.JK.GA.trackMakeRecording(); if(save_video && upload_to_youtube) { - // you have to have elected to save video to have upload to youtube have any effect + // you have to have elected to save video to have upload to youtube have context.VideoUploaderActions.showUploader(recording_id); } diff --git a/web/app/assets/javascripts/recordingModel.js b/web/app/assets/javascripts/recordingModel.js index b74fb24d9..57d9eaf7c 100644 --- a/web/app/assets/javascripts/recordingModel.js +++ b/web/app/assets/javascripts/recordingModel.js @@ -271,6 +271,13 @@ } function handleRecordingStopped(recordingId, result) { + + if(recordingId == "video") { + return; + } + + logger.debug("handleRecordingStopped " + recordingId, result) + var success = result.success; var reason = result.reason; var detail = result.detail; @@ -315,6 +322,11 @@ } function handleRecordingAborted(recordingId, result) { + + if(recordingId == "video") { + return; + } + var success = result.success; var reason = result.reason; var detail = result.detail;