hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'proper-attachments' into shigusegubu

Browse source 
* proper-attachments:
  changelog
  fix too-many-attachments in notifications column
This commit is contained in:
Henry Jameson 2022-01-24 21:47:46 +02:00
commit 5b2a802921
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/status_content/status_content.js
View file

@ -48,12 +48,12 @@ const StatusContent = {
return true
},
attachmentSize () {
if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
if (this.compact) {
return 'small'
} else if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
(this.mergedConfig.hideAttachmentsInConv && this.inConversation) ||
(this.status.attachments.length > this.maxThumbnails)) {
return 'hide'
} else if (this.compact) {
return 'small'
}
return 'normal'
},