diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
| commit | 3d033a468748338b6036cb24bb00ea4e88656ae6 (patch) | |
| tree | a1b3bcbe599a9298f4167769ea2c197f7ca596e6 /app/views/media/player.html.haml | |
| parent | e9052ceaafff786590fb66bee4550878cfb5a0df (diff) | |
| parent | c770b503c0e75015f8ba1ca90755b19326b64c3d (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts: Gemfile config/locales/simple_form.pl.yml
Diffstat (limited to 'app/views/media/player.html.haml')
| -rw-r--r-- | app/views/media/player.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml new file mode 100644 index 000000000..ea868b3f6 --- /dev/null +++ b/app/views/media/player.html.haml @@ -0,0 +1,2 @@ +%video{ poster: @media_attachment.file.url(:small), preload: 'auto', autoplay: 'autoplay', muted: 'muted', loop: 'loop', controls: 'controls', style: "width: #{@media_attachment.file.meta.dig('original', 'width')}px; height: #{@media_attachment.file.meta.dig('original', 'height')}px" } + %source{ src: @media_attachment.file.url(:original), type: @media_attachment.file_content_type } |