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

Merge branch 'attachment-collapse' into 'develop' 

When a post with a subject is collapsed, hide its attachments.

See merge request pleroma/pleroma-fe!316
This commit is contained in:
kaniini 2018-08-26 00:02:32 +00:00
parent 5bb5ef43ef 52ce86ed57
commit a7c6007d54
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/status/status.js
View File

@ -164,6 +164,15 @@ const Status = {
showingMore () { showingMore () {
return this.showingTall || (this.status.summary && this.expandingSubject) 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 () { attachmentSize () {
if ((this.$store.state.config.hideAttachments && !this.inConversation) || if ((this.$store.state.config.hideAttachments && !this.inConversation) ||
(this.$store.state.config.hideAttachmentsInConv && this.inConversation)) { (this.$store.state.config.hideAttachmentsInConv && this.inConversation)) {

4
src/components/status/status.vue
View File

@ -83,8 +83,8 @@
<a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
</div> </div>
<div v-if='status.attachments' class='attachments media-body'> <div v-if='status.attachments && !hideSubjectStatus' 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"> <attachment :size="attachmentSize" :status-id="status.id" :nsfw="nsfwClickthrough" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id">
</attachment> </attachment>
</div> </div>