summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-09-10 15:00:37 +0200
committerJules Laplace <julescarbon@gmail.com>2020-09-10 15:00:37 +0200
commita6b006ef1129d7a7e5e847d3b7514d76281c7e7a (patch)
treedf738d58e86d608196251438e83557be8a36153e
parent0e45ce2ea046068de8d792e653497dae5433ae77 (diff)
fix inline carousel
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js26
1 files changed, 14 insertions, 12 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js b/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js
index 991fc88..8d91675 100644
--- a/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js
+++ b/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js
@@ -33,17 +33,19 @@ const CarouselContainer = ({ element, media, play_ts }) => {
}
// step thru this carousel's timeline, which is ordered in reverse BTW
- element.timeline.some(cue => {
- if (cue.start_ts < play_ts && (play_ts - cue.start_ts) < 0.5) {
- let slide_index = cue.settings.seek_index
- if (currentSlide < slide_index) {
- setCurrentSlide(slide_index)
- slider.moveToSlideRelative(slide_index)
+ if (element) {
+ element.timeline.some(cue => {
+ if (cue.start_ts < play_ts && (play_ts - cue.start_ts) < 0.5) {
+ let slide_index = cue.settings.seek_index
+ if (currentSlide < slide_index) {
+ setCurrentSlide(slide_index)
+ slider.moveToSlideRelative(slide_index)
+ }
+ return true
}
- return true
- }
- return false
- })
+ return false
+ })
+ }
const currentCaption = caption_lookup[image_order[Math.round(currentSlide)]]
@@ -54,7 +56,7 @@ const CarouselContainer = ({ element, media, play_ts }) => {
sliderRef={sliderRef}
currentSlide={currentSlide}
currentCaption={currentCaption}
- timelineLookup={element.timelineLookup}
+ timelineLookup={element && element.timelineLookup}
/>
)
}
@@ -71,7 +73,7 @@ const CarouselComponent = ({ media, slider, sliderRef, currentSlide, currentCapt
key={id}
image={image}
slider={slider}
- seekAnnotation={timelineLookup[idx]}
+ seekAnnotation={timelineLookup && timelineLookup[idx]}
/>
)
})}