moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Display attachment description updates properly

See merge request seanking/pleroma-fe!2
This commit is contained in:
Sean King 2022-06-11 22:17:12 +00:00
parent 77e6aa6968 131febe653
commit 15005a2a50
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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