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

Merge branch 'fix/attachment-fixes-media-upload-unknown-type' into 'develop'

Browse Source 
Hide unknown type attachments, polish the upload preview styling

See merge request pleroma/pleroma-fe!168
This commit is contained in:
lambda 2017-11-20 11:52:46 +00:00
commit 8020363680
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ const Attachment = {
return this.nsfw && this.hideNsfwLocal && !this.showHidden return this.nsfw && this.hideNsfwLocal && !this.showHidden
}, },
isEmpty () { isEmpty () {
return this.type === 'html' && !this.attachment.oembed return (this.type === 'html' && !this.attachment.oembed) || this.type === 'unknown'
} }
}, },
methods: { methods: {

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

@ -80,6 +80,8 @@
} }
img.media-upload { img.media-upload {
margin-bottom: -2px;
max-height: 300px;
width: 100%; width: 100%;
height: 100%; height: 100%;
flex: 1; flex: 1;

2
src/components/post_status_form/post_status_form.vue
View File

@ -25,7 +25,7 @@
<i class="icon-cancel" @click="clearError"></i> <i class="icon-cancel" @click="clearError"></i>
</div> </div>
<div class="attachments"> <div class="attachments">
<div class="attachment" v-for="file in newStatus.files"> <div class="attachment base03-border" v-for="file in newStatus.files">
<i class="fa icon-cancel" @click="removeMediaFile(file)"></i> <i class="fa icon-cancel" @click="removeMediaFile(file)"></i>
<img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img> <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img>
<video v-if="type(file) === 'video'" :src="file.image" controls></video> <video v-if="type(file) === 'video'" :src="file.image" controls></video>