diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-11-21 23:19:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 23:19:04 +0100 |
| commit | f970e1fab6ca5d2334604b86d6e472e64510ea40 (patch) | |
| tree | f92a4f6d66c1fd8ea1e15481ec3ae3db16d0ba56 /app/javascript/mastodon/features/ui/components | |
| parent | 66832cbf33c0800f53bc0beb5e684053259e2b36 (diff) | |
Fix hardcoded frame rate for frame by frame video navigation in web UI (#15198)
Diffstat (limited to 'app/javascript/mastodon/features/ui/components')
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/focal_point_modal.js | 1 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/video_modal.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.js b/app/javascript/mastodon/features/ui/components/focal_point_modal.js index e19f277d8..2288be61d 100644 --- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js +++ b/app/javascript/mastodon/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/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js index 9a07e7c4d..cce6756c3 100644 --- a/app/javascript/mastodon/features/ui/components/video_modal.js +++ b/app/javascript/mastodon/features/ui/components/video_modal.js @@ -64,6 +64,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} |