Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 12:23:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refresh countdown number upon reopening dialog

Browse source
This commit is contained in:
David Rowe 2017-04-26 20:13:21 +12:00
parent 06f56f024b
commit 4581b9a0df
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/html/js/record.js
View file

@ -36,7 +36,7 @@ var isUsingToolbar = false,
STOP_PLAYING_RECORDING_ACTION = "stopPlayingRecording",
LOAD_RECORDING_ACTION = "loadRecording",
START_RECORDING_ACTION = "startRecording",
COUNTDOWN_NUMBER_ACTION = "countdownNumber",
SET_COUNTDOWN_NUMBER_ACTION = "setCountdownNumber",
STOP_RECORDING_ACTION = "stopRecording",
FINISH_ON_OPEN_ACTION = "finishOnOpen";
@ -193,7 +193,7 @@ function onScriptEventReceived(data) {
updateSpinner();
updateLoadButton();
break;
case COUNTDOWN_NUMBER_ACTION:
case SET_COUNTDOWN_NUMBER_ACTION:
elCountdownNumber.innerHTML = message.value;
break;
case STOP_RECORDING_ACTION:

25
scripts/system/record.js
View file

@ -199,7 +199,7 @@
}
function finishCountdown() {
Dialog.countdownNumber("");
Dialog.setCountdownNumber("");
recordingState = RECORDING;
startRecording();
}
@ -207,7 +207,7 @@
function cancelCountdown() {
recordingState = IDLE;
Script.clearInterval(countdownTimer);
Dialog.countdownNumber("");
Dialog.setCountdownNumber("");
log("Cancel countdown");
}
@ -215,7 +215,7 @@
recordingState = COUNTING_DOWN;
log("Start countdown");
countdownSeconds = COUNTDOWN_SECONDS;
Dialog.countdownNumber(countdownSeconds);
Dialog.setCountdownNumber(countdownSeconds);
playSound(tickSound);
countdownTimer = Script.setInterval(function () {
countdownSeconds -= 1;
@ -223,7 +223,7 @@
Script.clearInterval(countdownTimer);
finishCountdown();
} else {
Dialog.countdownNumber(countdownSeconds);
Dialog.setCountdownNumber(countdownSeconds);
playSound(tickSound);
}
}, 1000);
@ -405,6 +405,7 @@
Dialog = (function () {
var isFinishOnOpen = false,
countdownNumber = "",
EVENT_BRIDGE_TYPE = "record",
BODY_LOADED_ACTION = "bodyLoaded",
USING_TOOLBAR_ACTION = "usingToolbar",
@ -413,7 +414,7 @@
STOP_PLAYING_RECORDING_ACTION = "stopPlayingRecording",
LOAD_RECORDING_ACTION = "loadRecording",
START_RECORDING_ACTION = "startRecording",
COUNTDOWN_NUMBER_ACTION = "countdownNumber",
SET_COUNTDOWN_NUMBER_ACTION = "setCountdownNumber",
STOP_RECORDING_ACTION = "stopRecording",
FINISH_ON_OPEN_ACTION = "finishOnOpen",
SETTINGS_FINISH_ON_OPEN = "record/finishOnOpen";
@ -429,6 +430,11 @@
type: EVENT_BRIDGE_TYPE,
action: START_RECORDING_ACTION
}));
tablet.emitScriptEvent(JSON.stringify({
type: EVENT_BRIDGE_TYPE,
action: SET_COUNTDOWN_NUMBER_ACTION,
value: countdownNumber
}));
} else {
tablet.emitScriptEvent(JSON.stringify({
type: EVENT_BRIDGE_TYPE,
@ -463,11 +469,12 @@
}));
}
function countdownNumber(number) {
function setCountdownNumber(number) {
countdownNumber = number;
tablet.emitScriptEvent(JSON.stringify({
type: EVENT_BRIDGE_TYPE,
action: COUNTDOWN_NUMBER_ACTION,
value: number
action: SET_COUNTDOWN_NUMBER_ACTION,
value: countdownNumber
}));
}
@ -550,7 +557,7 @@
return {
updatePlayerDetails: updatePlayerDetails,
updateRecordingStatus: updateRecordingStatus,
countdownNumber: countdownNumber,
setCountdownNumber: setCountdownNumber,
finishOnOpen: finishOnOpen,
setUp: setUp,
tearDown: tearDown