Anon/yandere_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roger Braun 2016-11-24 18:38:36 +01:00
commit b645f1d0ba
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/attachment/attachment.js
View File

@ -23,6 +23,10 @@ const Attachment = {
type = 'video' type = 'video'
}; };
if (this.attachment.mimetype.match(/ogg|audio/)) {
type = 'audio'
}
return type return type
} }
}, },

6
src/components/attachment/attachment.vue
View File

@ -8,6 +8,8 @@
<video v-if="type === 'video' && !nsfw" :src="attachment.url" controls></video> <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> <span v-if="type === 'unknown'">Don't know how to display this...</span>
<div v-if="type === 'html' && attachment.oembed" class="oembed"> <div v-if="type === 'html' && attachment.oembed" class="oembed">
@ -42,6 +44,10 @@
width: 100%; width: 100%;
} }
audio {
width: 100%;
}
img.media-upload { img.media-upload {
width: 100%; width: 100%;
height: 100%; height: 100%;