From f35c090caaccf272c12358a2a02df71b9212d16c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 18 Jun 2021 02:27:32 +0300
Subject: [PATCH] merged in compact notifs and improved upon it
---
src/components/gallery/gallery.js | 10 +++++++---
src/components/gallery/gallery.vue | 2 +-
src/components/post_status_form/post_status_form.vue | 1 -
src/components/status_body/status_body.scss | 2 +-
src/components/status_body/status_body.vue | 5 ++++-
src/components/status_content/status_content.vue | 1 +
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js
index cca67dbd..ab13f698 100644
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@@ -6,6 +6,7 @@ const Gallery = {
'attachments',
'limitRows',
'descriptions',
+ 'limit',
'nsfw',
'setMedia',
'size',
@@ -26,11 +27,14 @@ const Gallery = {
if (!this.attachments) {
return []
}
+ console.log(this.limit)
+ const attachments = this.limit > 0
+ ? this.attachments.slice(0, this.limit)
+ : this.attachments
if (this.size === 'hide') {
- return this.attachments.map(item => ({ minimal: true, items: [item] }))
+ return attachments.map(item => ({ minimal: true, items: [item] }))
}
- const rows = this.attachments.reduce((acc, attachment, i) => {
- if (this.size === 'small' && acc.length === 2) return acc
+ const rows = attachments.reduce((acc, attachment, i) => {
if (attachment.mimetype.includes('audio')) {
return [...acc, { audio: true, items: [attachment] }, { items: [] }]
}
diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index cedf64d3..a1f1c26c 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -25,7 +25,7 @@
:remove="removeAttachment"
:edit="editAttachment"
:description="descriptions && descriptions[attachment.id]"
- :hideDescription="tooManyAttachments && hidingLong"
+ :hideDescription="size === 'small' || tooManyAttachments && hidingLong"
:style="itemStyle(attachment.id, row.items)"
@setMedia="onMedia"
@naturalSizeLoad="onNaturalSizeLoad"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index c6f84a4b..88ca4c9c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -298,7 +298,6 @@
:editable="true"
:editAttachment="editAttachment"
:removeAttachment="removeMediaFile"
- size="small"
@play="$emit('mediaplay', attachment.id)"
@pause="$emit('mediapause', attachment.id)"
/>
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index 516ced9d..5be21171 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -151,7 +151,7 @@
.attachments {
margin-top: 0;
- flex: 1 1 auto;
+ flex: 1 1 0;
min-width: 5em;
height: 100%;
}
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 2be46303..3eb13ce2 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -1,5 +1,8 @@
<template>
- <div class="StatusBody">
+<div
+ class="StatusBody"
+ :class="{ '-compact': compact }"
+ >
<div class="body">
<div
v-if="status.summary_raw_html"
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index c1533b19..90ce130d 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -20,6 +20,7 @@
v-if="status.attachments.length !== 0"
:nsfw="nsfwClickthrough"
:attachments="status.attachments"
+ :limit="this.compact ? 1 : 0"
:size="attachmentSize"
@setMedia="onMedia"
@play="$emit('mediaplay', attachment.id)"