From 84cfe1cb75345e5cae2090dec54dc1878fee1661 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 13 Apr 2017 17:00:35 +1200
Subject: [PATCH] Don't close dialog when start recording; press "Record" again
 to finish

---
 scripts/system/html/css/record.css |  4 +++
 scripts/system/html/js/record.js   | 55 +++++++++++++++++++++---------
 scripts/system/record.js           | 13 +++++--
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/scripts/system/html/css/record.css b/scripts/system/html/css/record.css
index 13325a5f9c..f9cb76780c 100644
--- a/scripts/system/html/css/record.css
+++ b/scripts/system/html/css/record.css
@@ -11,3 +11,7 @@
 .hidden {
     display: none;
 }
+
+input[type=button].red.pressed {
+    background: linear-gradient(#94132e, #94132e);
+}
diff --git a/scripts/system/html/js/record.js b/scripts/system/html/js/record.js
index 3c0c8598b6..393d4c246f 100644
--- a/scripts/system/html/js/record.js
+++ b/scripts/system/html/js/record.js
@@ -12,6 +12,7 @@
 
 var isUsingToolbar = false,
     isDisplayingInstructions = false,
+    isRecording = false,
     numberOfPlayers = 0,
     recordingsBeingPlayed = [],
     elRecordingsPlaying,
@@ -28,7 +29,8 @@ var isUsingToolbar = false,
     NUMBER_OF_PLAYERS_ACTION = "numberOfPlayers",
     STOP_PLAYING_RECORDING_ACTION = "stopPlayingRecording",
     LOAD_RECORDING_ACTION = "loadRecording",
-    START_RECORDING_ACTION = "startRecording";
+    START_RECORDING_ACTION = "startRecording",
+    STOP_RECORDING_ACTION = "stopRecording";
 
 function stopPlayingRecording(event) {
     var playerID = event.target.getElementsByTagName("input")[0].value;
@@ -152,6 +154,38 @@ function onScriptEventReceived(data) {
     }
 }
 
+function onLoadButtonClicked() {
+    EventBridge.emitWebEvent(JSON.stringify({
+        type: EVENT_BRIDGE_TYPE,
+        action: LOAD_RECORDING_ACTION
+    }));
+}
+
+function onRecordButtonClicked() {
+    if (!isRecording) {
+        elRecordButton.classList.add("pressed");
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: EVENT_BRIDGE_TYPE,
+            action: START_RECORDING_ACTION
+        }));
+        isRecording = true;
+    } else {
+        elRecordButton.classList.remove("pressed");
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: EVENT_BRIDGE_TYPE,
+            action: STOP_RECORDING_ACTION
+        }));
+        isRecording = false;
+    }
+}
+
+function signalBodyLoaded() {
+    EventBridge.emitWebEvent(JSON.stringify({
+        type: EVENT_BRIDGE_TYPE,
+        action: BODY_LOADED_ACTION
+    }));
+}
+
 function onBodyLoaded() {
 
     EventBridge.scriptEventReceived.connect(onScriptEventReceived);
@@ -167,23 +201,10 @@ function onBodyLoaded() {
     elShowInfoButton.onclick = showInstructions;
 
     elLoadButton = document.getElementById("load-button");
-    elLoadButton.onclick = function () {
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: EVENT_BRIDGE_TYPE,
-            action: LOAD_RECORDING_ACTION
-        }));
-    };
+    elLoadButton.onclick = onLoadButtonClicked;
 
     elRecordButton = document.getElementById("record-button");
-    elRecordButton.onclick = function () {
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: EVENT_BRIDGE_TYPE,
-            action: START_RECORDING_ACTION
-        }));
-    };
+    elRecordButton.onclick = onRecordButtonClicked;
 
-    EventBridge.emitWebEvent(JSON.stringify({
-        type: EVENT_BRIDGE_TYPE,
-        action: BODY_LOADED_ACTION
-    }));
+    signalBodyLoaded();
 }
diff --git a/scripts/system/record.js b/scripts/system/record.js
index 5d8c824366..0290f1e083 100644
--- a/scripts/system/record.js
+++ b/scripts/system/record.js
@@ -391,7 +391,8 @@
             NUMBER_OF_PLAYERS_ACTION = "numberOfPlayers",
             STOP_PLAYING_RECORDING_ACTION = "stopPlayingRecording",
             LOAD_RECORDING_ACTION = "loadRecording",
-            START_RECORDING_ACTION = "startRecording";
+            START_RECORDING_ACTION = "startRecording",
+            STOP_RECORDING_ACTION = "stopRecording";
 
         function onWebEventReceived(data) {
             var message = JSON.parse(data);
@@ -415,12 +416,18 @@
                     break;
                 case START_RECORDING_ACTION:
                     // Start making a recording.
-                    tablet.gotoHomeScreen();  // Closes window dialog.
-                    HMD.closeTablet();
                     if (Recorder.isIdle()) {
                         Recorder.startCountdown();
                     }
                     break;
+                case STOP_RECORDING_ACTION:
+                    // Cancel or finish a recording.
+                    if (Recorder.isCountingDown()) {
+                        Recorder.cancelCountdown();
+                    } else if (Recorder.isRecording()) {
+                        Recorder.finishRecording();
+                    }
+                    break;
                 }
             }
         }