diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-06 18:08:06 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-06 18:08:06 +0100 |
| commit | 90528f43bc988bac8c8280e917531f7505027570 (patch) | |
| tree | 6143b81902af21aff93a1dc40b2a2eff3593735b /app/views/media/player.html.haml | |
| parent | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (diff) | |
| parent | 69763b6385250902fdb329d030457159976f70ed (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.
Diffstat (limited to 'app/views/media/player.html.haml')
| -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 7369628a4..191586248 100644 --- a/app/views/media/player.html.haml +++ b/app/views/media/player.html.haml @@ -10,7 +10,7 @@ = render partial: 'layouts/theme', object: @theme - 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? |