Commit b645f1d0 authored by lain's avatar lain
Browse files

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

parents 4f0155c5 e30485fe
......@@ -23,6 +23,10 @@ const Attachment = {
type = 'video'
};
if (this.attachment.mimetype.match(/ogg|audio/)) {
type = 'audio'
}
return type
}
},
......
......@@ -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%;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment