From e02ca4fa05928613338f3b9ba0d1a13fde975c67 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 8 Sep 2020 19:32:01 +0200
Subject: each section has its own fullscreen timeline to prevent overlap

---
 animism-align/frontend/app/views/viewer/player/player.container.js  | 4 ++--
 animism-align/frontend/app/views/viewer/player/player.fullscreen.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'animism-align/frontend/app/views/viewer/player')

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)
-- 
cgit v1.2.3-70-g09d2