merged in compact notifs and improved upon it
This commit is contained in:
parent
c1293c3afa
commit
f35c090caa
6 changed files with 14 additions and 7 deletions
|
@ -6,6 +6,7 @@ const Gallery = {
|
|||
'attachments',
|
||||
'limitRows',
|
||||
'descriptions',
|
||||
'limit',
|
||||
'nsfw',
|
||||
'setMedia',
|
||||
'size',
|
||||
|
@ -26,11 +27,14 @@ const Gallery = {
|
|||
if (!this.attachments) {
|
||||
return []
|
||||
}
|
||||
console.log(this.limit)
|
||||
const attachments = this.limit > 0
|
||||
? this.attachments.slice(0, this.limit)
|
||||
: this.attachments
|
||||
if (this.size === 'hide') {
|
||||
return this.attachments.map(item => ({ minimal: true, items: [item] }))
|
||||
return attachments.map(item => ({ minimal: true, items: [item] }))
|
||||
}
|
||||
const rows = this.attachments.reduce((acc, attachment, i) => {
|
||||
if (this.size === 'small' && acc.length === 2) return acc
|
||||
const rows = attachments.reduce((acc, attachment, i) => {
|
||||
if (attachment.mimetype.includes('audio')) {
|
||||
return [...acc, { audio: true, items: [attachment] }, { items: [] }]
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
:remove="removeAttachment"
|
||||
:edit="editAttachment"
|
||||
:description="descriptions && descriptions[attachment.id]"
|
||||
:hideDescription="tooManyAttachments && hidingLong"
|
||||
:hideDescription="size === 'small' || tooManyAttachments && hidingLong"
|
||||
:style="itemStyle(attachment.id, row.items)"
|
||||
@setMedia="onMedia"
|
||||
@naturalSizeLoad="onNaturalSizeLoad"
|
||||
|
|
|
@ -298,7 +298,6 @@
|
|||
:editable="true"
|
||||
:editAttachment="editAttachment"
|
||||
:removeAttachment="removeMediaFile"
|
||||
size="small"
|
||||
@play="$emit('mediaplay', attachment.id)"
|
||||
@pause="$emit('mediapause', attachment.id)"
|
||||
/>
|
||||
|
|
|
@ -151,7 +151,7 @@
|
|||
|
||||
.attachments {
|
||||
margin-top: 0;
|
||||
flex: 1 1 auto;
|
||||
flex: 1 1 0;
|
||||
min-width: 5em;
|
||||
height: 100%;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
<template>
|
||||
<div class="StatusBody">
|
||||
<div
|
||||
class="StatusBody"
|
||||
:class="{ '-compact': compact }"
|
||||
>
|
||||
<div class="body">
|
||||
<div
|
||||
v-if="status.summary_raw_html"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
v-if="status.attachments.length !== 0"
|
||||
:nsfw="nsfwClickthrough"
|
||||
:attachments="status.attachments"
|
||||
:limit="this.compact ? 1 : 0"
|
||||
:size="attachmentSize"
|
||||
@setMedia="onMedia"
|
||||
@play="$emit('mediaplay', attachment.id)"
|
||||
|
|
Loading…
Reference in a new issue