about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/ui
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-11-21 23:19:04 +0100
committerThibaut Girka <thib@sitedethib.com>2020-11-25 15:46:09 +0100
commit51d0e1c7b4a4340a691fbcf0f0b4378519c6d21f (patch)
treeaf56176815f3daa1d8e6d77edaef8e407d56e1a4 /app/javascript/flavours/glitch/features/ui
parente71b16ae2b5623dc664c79ffa7d96282af662c78 (diff)
[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI
Port f970e1fab6ca5d2334604b86d6e472e64510ea40 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
-rw-r--r--app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js1
-rw-r--r--app/javascript/flavours/glitch/features/ui/components/video_modal.js1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
index 5de3e26d5..2485d9ae3 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
@@ -386,6 +386,7 @@ class FocalPointModal extends ImmutablePureComponent {
             {media.get('type') === 'video' && (
               <Video
                 preview={media.get('preview_url')}
+                frameRate={media.getIn(['meta', 'original', 'frame_rate'])}
                 blurhash={media.get('blurhash')}
                 src={media.get('url')}
                 detailed
diff --git a/app/javascript/flavours/glitch/features/ui/components/video_modal.js b/app/javascript/flavours/glitch/features/ui/components/video_modal.js
index c8d2a81b0..b0a4f3f03 100644
--- a/app/javascript/flavours/glitch/features/ui/components/video_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/video_modal.js
@@ -40,6 +40,7 @@ export default class VideoModal extends ImmutablePureComponent {
         <div className='video-modal__container'>
           <Video
             preview={media.get('preview_url')}
+            frameRate={media.getIn(['meta', 'original', 'frame_rate'])}
             blurhash={media.get('blurhash')}
             src={media.get('url')}
             currentTime={options.startTime}