From 6adfe561f65096d4117e8daa5aeb576552b6d060 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 21 Nov 2020 17:46:24 +0100 Subject: close fullscreen --- animism-align/frontend/app/views/viewer/player/player.fullscreen.css | 2 +- animism-align/frontend/app/views/viewer/player/player.fullscreen.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'animism-align/frontend/app/views/viewer/player') diff --git a/animism-align/frontend/app/views/viewer/player/player.fullscreen.css b/animism-align/frontend/app/views/viewer/player/player.fullscreen.css index 6c62a40..7384d34 100644 --- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.css +++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.css @@ -7,7 +7,7 @@ overflow: hidden; pointer-events: none; user-select: none; - opacity: 1.0; + opacity: 0.0; } .viewer-fullscreen.active { pointer-events: auto; 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 a4ea7d3..8727313 100644 --- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js +++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js @@ -122,11 +122,11 @@ class PlayerFullscreen extends Component { } render() { - const { audio, media, currentSection } = this.props + const { audio, media, currentSection, fullscreenVisible } = this.props const { play_ts, playing } = audio const { elements, persist } = this.state let className = "viewer-fullscreen"; - if (elements.length) { + if (elements.length && fullscreenVisible) { className += " active" } if (persist) { @@ -196,6 +196,7 @@ const FirstChild = (props) => { const mapStateToProps = state => ({ currentSection: state.viewer.currentSection, isFullscreen: state.viewer.isFullscreen, + fullscreenVisible: state.viewer.fullscreenVisible, audio: state.audio, media: state.media.index, timeline: state.viewer.currentSection ? state.viewer.currentSection.fullscreenTimeline : [], -- cgit v1.2.3-70-g09d2