summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-10-29 16:42:49 +0100
committerJules Laplace <julescarbon@gmail.com>2020-10-29 16:42:49 +0100
commit1ae7c4f1808e4353fa998eeca29385208fd17821 (patch)
tree42c769d45b91e797083bd1273c72b0ae856fa95a /animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js
parent35166bde2d54cc06d0095e59890226ea177cd7d8 (diff)
video scrubber inherits duration from fullscreen element, not video itself
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js')
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js3
1 files changed, 2 insertions, 1 deletions
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 7f23ac7..78c7807 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
@@ -62,7 +62,7 @@ class FullscreenVideo extends Component {
video={item.url}
paused={!playing}
autoplay={true}
- muted={!annotation.settings.unmuted}
+ muted={!element.settings.unmuted}
loop={!!element.settings.loop}
seek={this.state.seek}
responsive={true}
@@ -77,6 +77,7 @@ class FullscreenVideo extends Component {
<VideoScrubber
start_ts={element.start_ts}
playing={playing}
+ duration={element.duration}
timing={this.state}
onScrub={this.handleTimeUpdate}
/>