From a1053ee5a09af175178c2267ed904d462dacf259 Mon Sep 17 00:00:00 2001 From: AlessandroSigna Date: Fri, 20 Nov 2015 16:21:42 -0800 Subject: [PATCH] pop up a prompt with url --- examples/entityScripts/recordingEntityScript.js | 2 +- examples/entityScripts/recordingMaster.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/entityScripts/recordingEntityScript.js b/examples/entityScripts/recordingEntityScript.js index 8f5e9a03b9..132b064997 100644 --- a/examples/entityScripts/recordingEntityScript.js +++ b/examples/entityScripts/recordingEntityScript.js @@ -82,12 +82,12 @@ print("RECORDING ENDED"); Recording.stopRecording(); isAvatarRecording = false; - Recording.saveRecordingToAsset(getClipUrl); //save the clip to the asset and link a callback to get its url var recordingFile = Window.save("Save recording to file", "./groupRecording", "Recordings (*.hfr)"); if (!(recordingFile === "null" || recordingFile === null || recordingFile === "")) { Recording.saveRecording(recordingFile); //save the clip locally } + Recording.saveRecordingToAsset(getClipUrl); //save the clip to the asset and link a callback to get its url } }, diff --git a/examples/entityScripts/recordingMaster.js b/examples/entityScripts/recordingMaster.js index cc3fa79026..70ae93075f 100644 --- a/examples/entityScripts/recordingMaster.js +++ b/examples/entityScripts/recordingMaster.js @@ -32,7 +32,6 @@ var TIMEOUT = 20; var toolBar = null; var recordIcon; var isRecording = false; -var avatarClips = []; var performanceJSON = { "avatarClips" : [] }; var responsesExpected = 0; var waitingForPerformanceFile = true; @@ -109,7 +108,6 @@ function update(deltaTime) { responsesExpected = 0; totalWaitingTime = 0; Script.update.disconnect(update); - avatarClips = []; performanceJSON = { "avatarClips" : [] }; } } @@ -122,8 +120,8 @@ function uploadFinished(url){ Assets.downloadData(url, function (data) { printPerformanceJSON(JSON.parse(data)); }); - //need to print somehow the url here //this way the master can copy the url - //Window.prompt(url); + //need to print somehow the url here this way the master can copy the url + Window.prompt("Performance file url: ", url); } function printPerformanceJSON(obj) {