pleroma-fe

commit: a7c6007d54d5e4f083a9bc8475d4041e78a3c2bf
parent: 5bb5ef43ef272bbabe722b8a3fd4c32c087c3c27
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 26 Aug 2018 00:02:32 +0000

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:
M
src/components/status/status.js
9
+++++++++
M
src/components/status/status.vue
4
++--

2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
@@ -164,6 +164,15 @@ const Status = {
     showingMore () {
       return this.showingTall || (this.status.summary && this.expandingSubject)
     },
+    nsfwClickthrough () {
+      if (!this.status.nsfw) {
+        return false
+      }
+      if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) {
+        return false
+      }
+      return true
+    },
     attachmentSize () {
       if ((this.$store.state.config.hideAttachments && !this.inConversation) ||
         (this.$store.state.config.hideAttachmentsInConv && this.inConversation)) {
diff --git 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>