From 7fe7dbba2201d137f374fa7c95e20848b89d942b Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 5 Nov 2020 16:57:33 +0100 Subject: fix scrubber. fix next hover. damn --- .../views/viewer/player/components.fullscreen/fullscreen.video.js | 7 ++++++- .../app/views/viewer/player/components.media/video.scrubber.js | 1 + .../frontend/app/views/viewer/player/player.fullscreen.js | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'animism-align/frontend/app/views/viewer/player') diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js index a2c4b72..e226bab 100644 --- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js +++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js @@ -28,6 +28,7 @@ class FullscreenVideo extends Component { this.handlePlay = this.handlePlay.bind(this) this.handlePause = this.handlePause.bind(this) this.handleTimeUpdate = this.handleTimeUpdate.bind(this) + this.handleScrub = this.handleScrub.bind(this) this.handleEnd = this.handleEnd.bind(this) } componentDidMount() { @@ -61,6 +62,10 @@ class FullscreenVideo extends Component { this.setState(timing) } } + handleScrub(timing) { + console.log(timing) + this.setState(timing) + } render() { const { element, media, transitionDuration, play_ts, playing } = this.props @@ -109,7 +114,7 @@ class FullscreenVideo extends Component { playing={playing} duration={element.duration} timing={this.state} - onScrub={this.handleTimeUpdate} + onScrub={this.handleScrub} /> ) diff --git a/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js b/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js index 78c4b1d..aec82ca 100644 --- a/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js @@ -55,6 +55,7 @@ class VideoScrubber extends Component { // in case the video loops, modulo the length of the original video const video_seek = ((seconds + video_start_ts) % timing.duration) // + console.log(start_ts, seconds) onScrub({ seek: video_seek, seconds: seconds, 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 75a7e33..2f17375 100644 --- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js +++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js @@ -49,6 +49,7 @@ class PlayerFullscreen extends Component { // also any elements starting at this point should transition immediately, // to prevent flash of the underlying content. if (seekedElements.length) { + // console.log(play_ts, seek_ts, 'seeked', seekedElements) elements = seekedElements.map(e => { if (e.start_ts === seek_ts && e.type !== 'curtain') { return { @@ -58,6 +59,8 @@ class PlayerFullscreen extends Component { } return e }) + } else { + // console.log(play_ts, seek_ts, 'elements', elements) } // console.log(elements) // set nav style from top-most element -- cgit v1.2.3-70-g09d2