summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer/player
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-09-08 19:32:01 +0200
committerJules Laplace <julescarbon@gmail.com>2020-09-08 19:32:01 +0200
commite02ca4fa05928613338f3b9ba0d1a13fde975c67 (patch)
treee2f4c0a1418ddfdedc083e88bf215ebe69cb3606 /animism-align/frontend/app/views/viewer/player
parent8d9c08e93a7ff3c1c8477421acc509224bca3dfd (diff)
each section has its own fullscreen timeline to prevent overlap
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player')
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.container.js4
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.fullscreen.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/player.container.js b/animism-align/frontend/app/views/viewer/player/player.container.js
index 1c82e0d..3379bfe 100644
--- a/animism-align/frontend/app/views/viewer/player/player.container.js
+++ b/animism-align/frontend/app/views/viewer/player/player.container.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
import { connect } from 'react-redux'
import actions from 'app/actions'
+import { GROWL } from 'app/constants'
import { floatInRange, clamp } from 'app/utils'
import PlayerTranscript from './player.transcript'
@@ -74,11 +75,10 @@ class PlayerContainer extends Component {
if (floatInRange(currentSection.start_ts, play_ts, currentSection.end_ts)) {
return
}
-
if (autoAdvance) {
actions.viewer.setSectionFromTimestamp(play_ts)
} else {
- actions.viewer.reachedEndOfSection()
+ actions.viewer.reachedEndOfSection(currentSection)
}
}
diff --git a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
index 2f62ff5..90e4925 100644
--- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
+++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
@@ -103,7 +103,7 @@ const FirstChild = (props) => {
const mapStateToProps = state => ({
audio: state.audio,
media: state.media.index,
- timeline: state.viewer.fullscreenTimeline,
+ timeline: state.viewer.currentSection ? state.viewer.currentSection.fullscreenTimeline : [],
})
export default connect(mapStateToProps)(PlayerFullscreen)