logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: b645f1d0ba41b9265735033a1f762470ac54b34f
parent: 4f0155c5eb532fea6cde2aea870824f936923132
Author: Roger Braun <roger@rogerbraun.net>
Date:   Thu, 24 Nov 2016 18:38:36 +0100

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

Diffstat:

Msrc/components/attachment/attachment.js4++++
Msrc/components/attachment/attachment.vue6++++++
2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js @@ -23,6 +23,10 @@ const Attachment = { type = 'video' }; + if (this.attachment.mimetype.match(/ogg|audio/)) { + type = 'audio' + } + return type } }, diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue @@ -8,6 +8,8 @@ <video v-if="type === 'video' && !nsfw" :src="attachment.url" controls></video> + <audio v-if="type === 'audio'" :src="attachment.url" controls></audio> + <span v-if="type === 'unknown'">Don't know how to display this...</span> <div v-if="type === 'html' && attachment.oembed" class="oembed"> @@ -42,6 +44,10 @@ width: 100%; } + audio { + width: 100%; + } + img.media-upload { width: 100%; height: 100%;