logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 15005a2a50aafb2f68bb48ff35eebf498654f028
parent 77e6aa696851f46674fa0266f0ca5849a4a562c1
Author: Sean King <seanking2919@protonmail.com>
Date:   Sat, 11 Jun 2022 22:17:12 +0000

Merge branch 'from/edit-status/tusooa/1' into 'add/edit-status'

Display attachment description updates properly

See merge request seanking/pleroma-fe!2

Diffstat:

Msrc/components/attachment/attachment.vue6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue @@ -166,7 +166,7 @@ :icon="placeholderIconClass" /> <p> - {{ localDescription }} + {{ edit ? localDescription : attachment.description }} </p> </a> @@ -244,7 +244,7 @@ </span> </div> <div - v-if="size !== 'hide' && !hideDescription && (edit || (localDescription && showDescription))" + v-if="size !== 'hide' && !hideDescription && (edit || (attachment.description && showDescription))" class="description-container" :class="{ '-static': !edit }" > @@ -257,7 +257,7 @@ @keydown.enter.prevent="" > <p v-else> - {{ localDescription }} + {{ attachment.description }} </p> </div> </div>