diff options
Diffstat (limited to 'animism-align')
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 */ |