about summary refs log tree commit diff
path: root/app/views/media
diff options
context:
space:
mode:
authorTakeshi Umeda <noel.yoshiba@gmail.com>2020-12-31 07:18:11 +0900
committerGitHub <noreply@github.com>2020-12-30 23:18:11 +0100
commitcb5bb2313b333b8f985e26a09415069b43770a37 (patch)
tree7ab941f3d6b69ff78d35090d0b8298d4baec61f7 /app/views/media
parentb5bd67a4775ccd528ce89eb00cfc208b3b8fa75f (diff)
Fix expand video on public page (#15469)
Diffstat (limited to 'app/views/media')
-rw-r--r--app/views/media/player.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index 92428ca94..95e37bb22 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -3,7 +3,7 @@
   = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 - if @media_attachment.video?
-  = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description do
+  = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), frameRate: @media_attachment.file.meta.dig('original', 'frame_rate'), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description, media: [ActiveModelSerializers::SerializableResource.new(@media_attachment, serializer: REST::MediaAttachmentSerializer)].as_json do
     %video{ controls: 'controls' }
       %source{ src: @media_attachment.file.url(:original) }
 - elsif @media_attachment.gifv?