diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-10 16:51:51 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-10 16:51:51 +0200 |
| commit | 50544627592db864cfe9c7ddb138b299344f0d44 (patch) | |
| tree | ce1d528ae605cc418303fb3268d0ccb2164b380e /app/views/media | |
| parent | d42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4 (diff) | |
| parent | a2abe35e0f55c96e8b8525ee25089751859d14c2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/media')
| -rw-r--r-- | app/views/media/player.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml index 1d0374897..ae47750e9 100644 --- a/app/views/media/player.html.haml +++ b/app/views/media/player.html.haml @@ -3,7 +3,7 @@ = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' - if @media_attachment.video? - = react_component :video, src: @media_attachment.file.url(:original), preview: @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), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description do %video{ controls: 'controls' } %source{ src: @media_attachment.file.url(:original) } - elsif @media_attachment.gifv? |