From 24d4124ffcd3b26d2f9fbec87f917b584f494ece Mon Sep 17 00:00:00 2001
From: KanariKanaru <93921745+kanarikanaru@users.noreply.github.com>
Date: Thu, 30 May 2024 17:36:58 +0900
Subject: fix(frontend):
ノートにテキストがなくてもファイルが5つ以上あるときは折りたたむように
(#13907)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: ノートにテキストがなくてもファイルが5つ以上あるときは折りたたむように
* 冗長な記述を修正
* Update CHANGELOG.md
---
packages/frontend/src/scripts/collapsed.ts | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'packages/frontend')
diff --git a/packages/frontend/src/scripts/collapsed.ts b/packages/frontend/src/scripts/collapsed.ts
index 237bd37c7a..4ec88a3c65 100644
--- a/packages/frontend/src/scripts/collapsed.ts
+++ b/packages/frontend/src/scripts/collapsed.ts
@@ -6,15 +6,16 @@
import * as Misskey from 'misskey-js';
export function shouldCollapsed(note: Misskey.entities.Note, urls: string[]): boolean {
- const collapsed = note.cw == null && note.text != null && (
- (note.text.includes('$[x2')) ||
- (note.text.includes('$[x3')) ||
- (note.text.includes('$[x4')) ||
- (note.text.includes('$[scale')) ||
- (note.text.split('\n').length > 9) ||
- (note.text.length > 500) ||
- (note.files.length >= 5) ||
- (urls.length >= 4)
+ const collapsed = note.cw == null && (
+ note.text != null && (
+ (note.text.includes('$[x2')) ||
+ (note.text.includes('$[x3')) ||
+ (note.text.includes('$[x4')) ||
+ (note.text.includes('$[scale')) ||
+ (note.text.split('\n').length > 9) ||
+ (note.text.length > 500) ||
+ (urls.length >= 4)
+ ) || note.files.length >= 5
);
return collapsed;
--
cgit v1.2.3-freya
From ac4a001e9f193e4727a8e65e59978a9464a56d75 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 31 May 2024 10:11:11 +0900
Subject: fix code style
---
.../src/components/MkCustomEmojiDetailedDialog.vue | 108 +++++++++++----------
1 file changed, 56 insertions(+), 52 deletions(-)
(limited to 'packages/frontend')
diff --git a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
index 84b5375a41..c7f1288729 100644
--- a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
+++ b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
@@ -4,77 +4,81 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
- :{{ emoji.name }}:
-
-
-
-
-
-
-
- {{ i18n.ts.name }}
- {{ emoji.name }}
-
-
- {{ i18n.ts.tags }}
-
- {{ i18n.ts.none }}
-
-
- {{ alias }}
-
-
-
-
-
- {{ i18n.ts.category }}
- {{ emoji.category ?? i18n.ts.none }}
-
-
- {{ i18n.ts.sensitive }}
- {{ emoji.isSensitive ? i18n.ts.yes : i18n.ts.no }}
-
-
- {{ i18n.ts.localOnly }}
- {{ emoji.localOnly ? i18n.ts.yes : i18n.ts.no }}
-
-
- {{ i18n.ts.license }}
-
-
-
- {{ i18n.ts.emojiUrl }}
-
- {{ emoji.url }}
-
-
-
-
-
-
+
+ :{{ emoji.name }}:
+
+
+
+
+
+
+
+ {{ i18n.ts.name }}
+ {{ emoji.name }}
+
+
+ {{ i18n.ts.tags }}
+
+ {{ i18n.ts.none }}
+
+
+ {{ alias }}
+
+
+
+
+
+ {{ i18n.ts.category }}
+ {{ emoji.category ?? i18n.ts.none }}
+
+
+ {{ i18n.ts.sensitive }}
+ {{ emoji.isSensitive ? i18n.ts.yes : i18n.ts.no }}
+
+
+ {{ i18n.ts.localOnly }}
+ {{ emoji.localOnly ? i18n.ts.yes : i18n.ts.no }}
+
+
+ {{ i18n.ts.license }}
+
+
+
+ {{ i18n.ts.emojiUrl }}
+
+ {{ emoji.url }}
+
+
+
+
+
+