summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-09-09 22:11:44 +0200
committerJules Laplace <julescarbon@gmail.com>2020-09-09 22:11:44 +0200
commitf1af7754bf4814a4eaa3f2a2099fbef58502d030 (patch)
treed63640592283d51c7006a250d624ea30367b9d63
parent6136baa5e782eba3477f7a3bdc8ba8f03a64452f (diff)
short_caption
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js8
1 files changed, 3 insertions, 5 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 c2d091a..3759c30 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
@@ -23,18 +23,16 @@ const CarouselContainer = ({ element, play_ts, media }) => {
spacing: SPACING,
centered: true,
loop: false,
- // duration: 700,
slideChanged: slideChanged,
})
slideChangedHook = s => {
- const currentSlideIndex = s.details().relativeSlide
- setCurrentSlide(currentSlideIndex)
+ setCurrentSlide(s.details().relativeSlide)
}
// step thru this carousel's timeline, which is ordered in reverse BTW
element.timeline.some(cue => {
- if (cue.start_ts < play_ts) {
+ if (cue.start_ts < play_ts && (play_ts - cue.start_ts) < 0.5) {
let slide_index = parseInt(cue.settings.frame_index)
if (cue.settings.half_frame) {
slide_index += 0.5
@@ -74,7 +72,7 @@ const CarouselComponent = ({ media, slider, sliderRef, currentSlide, currentCapt
)
})}
</div>,
- <MediaCitation key={'caption_' + media.id} media={(currentCaption && currentCaption.title) ? currentCaption : media} />,
+ <MediaCitation key={'caption_' + media.id} media={(currentCaption && currentCaption.short_caption) ? currentCaption : media} />,
<CarouselNav
key={'arrows_' + media.id}
currentSlide={currentSlide}