diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-26 00:02:32 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-26 00:02:32 +0000 |
| commit | a7c6007d54d5e4f083a9bc8475d4041e78a3c2bf (patch) | |
| tree | c74d480cf0ebf5262cb3d3516674b32ee10ed824 /src/components/status/status.vue | |
| parent | 5bb5ef43ef272bbabe722b8a3fd4c32c087c3c27 (diff) | |
| parent | 52ce86ed573deede5e762f4096ef02ee87b04e88 (diff) | |
Merge branch 'attachment-collapse' into 'develop'
When a post with a subject is collapsed, hide its attachments.
See merge request pleroma/pleroma-fe!316
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 2bc44ee7..c7ef92a2 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -83,8 +83,8 @@ <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> </div> - <div v-if='status.attachments' class='attachments media-body'> - <attachment :size="attachmentSize" :status-id="status.id" :nsfw="status.nsfw" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id"> + <div v-if='status.attachments && !hideSubjectStatus' class='attachments media-body'> + <attachment :size="attachmentSize" :status-id="status.id" :nsfw="nsfwClickthrough" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id"> </attachment> </div> |