summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-11-21 20:29:22 +0100
committerJules Laplace <julescarbon@gmail.com>2020-11-21 20:29:22 +0100
commit0e6b4779b0670f6e4d4d68607d8c20d0a8777536 (patch)
treec523430604af2fa68265d16aa841288c8714f276 /animism-align/frontend/app/views/viewer
parent61e0cbf77ee3d990bf668eacc52c3465480f67dc (diff)
fix natasha
Diffstat (limited to 'animism-align/frontend/app/views/viewer')
-rw-r--r--animism-align/frontend/app/views/viewer/nav/eflux.chrome.js2
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.fullscreen.js6
-rw-r--r--animism-align/frontend/app/views/viewer/viewer.reducer.js1
3 files changed, 7 insertions, 2 deletions
diff --git a/animism-align/frontend/app/views/viewer/nav/eflux.chrome.js b/animism-align/frontend/app/views/viewer/nav/eflux.chrome.js
index d2462b2..7d1fef2 100644
--- a/animism-align/frontend/app/views/viewer/nav/eflux.chrome.js
+++ b/animism-align/frontend/app/views/viewer/nav/eflux.chrome.js
@@ -68,6 +68,7 @@ class EfluxChrome extends Component {
if (navGradient) className += ' gradient'
if (transcriptOpen) className += ' transcript-open'
if (isFullscreen) className += ' is-fullscreen'
+ console.log(isFullscreen, fullscreenVisible, isFullscreenSingleton)
const fullscreenWantsCloseButton = isFullscreen && fullscreenVisible && !isFullscreenSingleton
return (
<div className={className}>
@@ -163,6 +164,7 @@ const mapStateToProps = state => ({
currentSection: state.viewer.currentSection,
isFullscreen: state.viewer.isFullscreen,
fullscreenVisible: state.viewer.fullscreenVisible,
+ isFullscreenSingleton: state.viewer.isFullscreenSingleton,
})
export default connect(mapStateToProps)(EfluxChrome)
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 a1cc235..f339510 100644
--- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
+++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
@@ -38,7 +38,8 @@ class PlayerFullscreen extends Component {
let elements, isSingleton = false, atChapterStart = false
// console.log(timeline)
// some classes can be singleton media for an entire chapter, like vitrines
- if (timeline.length === 1 && timeline[0].type === 'vitrine') {
+ // console.log(timeline.map(t => t.type))
+ if (timeline.length === 2 && timeline[1].type === 'vitrine') {
elements = timeline
isSingleton = true
}
@@ -118,7 +119,7 @@ class PlayerFullscreen extends Component {
actions.viewer.setMediaTitle(null)
}
// if fullscreen mode started or ended...
- if (!!elements.length !== this.props.isFullscreen) {
+ if (!!elements.length !== this.props.isFullscreen || isSingleton !== this.props.isSingleton) {
actions.viewer.updateFullscreenStatus(!!elements.length, persist, isSingleton)
}
// elements.reverse()
@@ -206,6 +207,7 @@ const FirstChild = (props) => {
const mapStateToProps = state => ({
currentSection: state.viewer.currentSection,
isFullscreen: state.viewer.isFullscreen,
+ isSingleton: state.viewer.isFullscreenSingleton,
fullscreenVisible: state.viewer.fullscreenVisible,
audio: state.audio,
media: state.media.index,
diff --git a/animism-align/frontend/app/views/viewer/viewer.reducer.js b/animism-align/frontend/app/views/viewer/viewer.reducer.js
index efb374f..0fcbfa2 100644
--- a/animism-align/frontend/app/views/viewer/viewer.reducer.js
+++ b/animism-align/frontend/app/views/viewer/viewer.reducer.js
@@ -26,6 +26,7 @@ const initialState = {
onlyEnableFirstSection: isHandheld,
isFullscreen: false,
isFullscreenPersist: false,
+ isFullscreenSingleton: false,
fullscreenVisible: true,
/* footnotes */