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:
commit
15005a2a50
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue