This commit is contained in:
Henry Jameson 2021-06-22 20:47:35 +03:00
parent dd3fe61cf3
commit b67db47c88
6 changed files with 25 additions and 26 deletions

View File

@ -15,11 +15,11 @@
@click.prevent=""
>
<FAIcon :icon="placeholderIconClass" />
<b>{{ nsfw ? "NSFW / " : "" }}</b>{{ this.edit ? '' : placeholderName }}
<b>{{ nsfw ? "NSFW / " : "" }}</b>{{ edit ? '' : placeholderName }}
</a>
<div
class="attachment-buttons"
v-if="edit || remove"
class="attachment-buttons"
>
<button
v-if="remove"
@ -48,13 +48,13 @@
</div>
</button>
<div
v-else
class="Attachment"
:class="classNames"
v-else
>
<div
class="attachment-wrapper"
v-show="!isEmpty"
class="attachment-wrapper"
>
<a
v-if="hidden"
@ -76,8 +76,8 @@
/>
</a>
<div
class="attachment-buttons"
v-if="!hidden"
class="attachment-buttons"
>
<button
v-if="type === 'flash' && flashLoaded"
@ -190,8 +190,8 @@
@click.stop.prevent="openModal"
>
<Flash
class="flash"
ref="flash"
class="flash"
:src="attachment.large_thumb_url || attachment.url"
@playerOpened="setFlashLoaded(true)"
@playerClosed="setFlashLoaded(false)"

View File

@ -1,7 +1,7 @@
<template>
<div
class="Gallery"
ref="galleryContainer"
class="Gallery"
:class="{ '-long': tooManyAttachments && hidingLong }"
>
<div class="gallery-rows">
@ -18,8 +18,8 @@
>
<attachment
v-for="attachment in row.items"
class="gallery-item"
:key="attachment.id"
class="gallery-item"
:nsfw="nsfw"
:attachment="attachment"
:allow-play="false"
@ -28,7 +28,7 @@
:remove="removeAttachment"
:edit="editAttachment"
:description="descriptions && descriptions[attachment.id]"
:hideDescription="size === 'small' || tooManyAttachments && hidingLong"
:hide-description="size === 'small' || tooManyAttachments && hidingLong"
:style="itemStyle(attachment.id, row.items)"
@setMedia="onMedia"
@naturalSizeLoad="onNaturalSizeLoad"
@ -67,8 +67,8 @@
</button>
</span>
<span
class="many-attachments-button"
v-if="hidingLong"
class="many-attachments-button"
>
<button
class="button-unstyled -link"

View File

@ -296,8 +296,8 @@
:descriptions="newStatus.mediaDescriptions"
:set-media="() => $store.dispatch('setMedia', newStatus.files)"
:editable="true"
:editAttachment="editAttachment"
:removeAttachment="removeMediaFile"
:edit-attachment="editAttachment"
:remove-attachment="removeMediaFile"
@play="$emit('mediaplay', attachment.id)"
@pause="$emit('mediapause', attachment.id)"
/>

View File

@ -3,7 +3,6 @@ import Poll from '../poll/poll.vue'
import Gallery from '../gallery/gallery.vue'
import StatusBody from 'src/components/status_body/status_body.vue'
import LinkPreview from '../link-preview/link-preview.vue'
import fileType from 'src/services/file_type/file_type.service'
import { mapGetters, mapState } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core'
import {

View File

@ -16,11 +16,11 @@
</div>
<gallery
class="attachments media-body"
v-if="status.attachments.length !== 0"
class="attachments media-body"
:nsfw="nsfwClickthrough"
:attachments="status.attachments"
:limit="this.compact ? 1 : 0"
:limit="compact ? 1 : 0"
:size="attachmentSize"
@setMedia="onMedia"
@play="$emit('mediaplay', attachment.id)"