seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3625 - tell backend correctly abot keeping video if user discards, and filter out recordingId of video

This commit is contained in:
Seth Call 2015-10-08 12:18:18 -05:00
parent 4bdf555409
commit c3097d4436
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/app/assets/javascripts/dialog/recordingFinishedDialog.js
View File

@ -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);
}

12
web/app/assets/javascripts/recordingModel.js
View File

@ -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;