summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer/viewer.actions.js
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-10-14 18:17:50 +0200
committerJules Laplace <julescarbon@gmail.com>2020-10-14 18:17:50 +0200
commit606cf200f49a7015a2e189f80ab380b57f767363 (patch)
tree208c3ddfcf485503a303a6ec6c6a5633a59fc51e /animism-align/frontend/app/views/viewer/viewer.actions.js
parent2d7af61fb12160e65bc373f1597a61f15da8d4ae (diff)
making sure audio is loaded before we start
Diffstat (limited to 'animism-align/frontend/app/views/viewer/viewer.actions.js')
-rw-r--r--animism-align/frontend/app/views/viewer/viewer.actions.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/animism-align/frontend/app/views/viewer/viewer.actions.js b/animism-align/frontend/app/views/viewer/viewer.actions.js
index 16a3d8f..6894b3a 100644
--- a/animism-align/frontend/app/views/viewer/viewer.actions.js
+++ b/animism-align/frontend/app/views/viewer/viewer.actions.js
@@ -22,7 +22,7 @@ export const loadSections = () => dispatch => {
let sections = []
// current section being processed (i.e. last section)
- let currentSection
+ let currentSection, sectionColor
// keep tally of all media, so that we can display them with correct IDs in the checklist
let mediaIndex = 0
@@ -159,12 +159,13 @@ export const loadSections = () => dispatch => {
}
if ((!currentSection.fullscreenTimeline.length || time_to_first_fullscreen_element > 0.0) && currentSection.index !== 0) {
// here we should create a dummy curtain event
+ sectionColor = currentSection.paragraphs[0].annotations[0].settings.color || 'white'
initial_curtain_event = makeFullscreenEvent(0, {
start_ts: currentSection.start_ts,
end_ts: currentSection.start_ts + 1.1,
type: 'curtain',
settings: {
- color: CURTAIN_COLOR_LOOKUP.white, // TODO: get this from the first annotation
+ color: CURTAIN_COLOR_LOOKUP[sectionColor],
fade_in_duration: '0.0',
fade_out_duration: '1.0',
duration: '1.0',