diff options
| author | Starfall <us@starfall.systems> | 2020-07-11 12:31:22 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-11 12:31:22 -0500 |
| commit | 2f20bc2a8275875033c97249825a2a3305980c3b (patch) | |
| tree | 079a021ab1ce792a40555e0718f9861ee8b53f7a /app/views/media | |
| parent | 816d10c7eecd83cb0f115c10328cbb504dabc7e9 (diff) | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
Merge branch 'glitch' into main
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? |