From e2f34e3db684b2258db3e7370675afe894f5e301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=9C=E7=89=A9=E3=83=AA=E3=83=B3?= <nassii74@gmail.com>
Date: Tue, 31 Oct 2023 17:26:59 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20headerAction=E3=81=ABPC=E4=BB=A5?=
=?UTF-8?q?=E5=A4=96=E3=81=A7=E7=A9=BA=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3?=
=?UTF-8?q?=E3=81=8C=E5=87=BA=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=83=90?=
=?UTF-8?q?=E3=82=B0=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#12202)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* headerActionにPC以外で空のボタンが出てしまうバグの修正
* fix eslint
---
packages/frontend/src/pages/timeline.vue | 62 +++++++++++++-----------
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index f601bc8a85..5b97385ead 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -140,36 +140,42 @@ function focus(): void {
tlComponent.focus();
}
-const headerActions = $computed(() => [
- ...[deviceKind === 'desktop' ? {
- icon: 'ti ti-refresh',
- text: i18n.ts.reload,
- handler: (ev) => {
- console.log('called');
- tlComponent.reloadTimeline();
- },
- } : {}], {
- icon: 'ti ti-dots',
- text: i18n.ts.options,
- handler: (ev) => {
- os.popupMenu([{
- type: 'switch',
- text: i18n.ts.showRenotes,
- icon: 'ti ti-repeat',
- ref: $$(withRenotes),
- }, src === 'local' || src === 'social' ? {
- type: 'switch',
- text: i18n.ts.showRepliesToOthersInTimeline,
- ref: $$(withReplies),
- } : undefined, {
- type: 'switch',
- text: i18n.ts.fileAttachedOnly,
- icon: 'ti ti-photo',
- ref: $$(onlyFiles),
- }], ev.currentTarget ?? ev.target);
+const headerActions = $computed(() => {
+ const tmp = [
+ {
+ icon: 'ti ti-dots',
+ text: i18n.ts.options,
+ handler: (ev) => {
+ os.popupMenu([{
+ type: 'switch',
+ text: i18n.ts.showRenotes,
+ icon: 'ti ti-repeat',
+ ref: $$(withRenotes),
+ }, src === 'local' || src === 'social' ? {
+ type: 'switch',
+ text: i18n.ts.showRepliesToOthersInTimeline,
+ ref: $$(withReplies),
+ } : undefined, {
+ type: 'switch',
+ text: i18n.ts.fileAttachedOnly,
+ icon: 'ti ti-photo',
+ ref: $$(onlyFiles),
+ }], ev.currentTarget ?? ev.target);
+ },
},
+ ];
+ if (deviceKind === 'desktop') {
+ tmp.unshift({
+ icon: 'ti ti-refresh',
+ text: i18n.ts.reload,
+ handler: (ev: Event) => {
+ console.log('called');
+ tlComponent.reloadTimeline();
+ },
+ });
}
-]);
+ return tmp;
+});
const headerTabs = $computed(() => [...(defaultStore.reactiveState.pinnedUserLists.value.map(l => ({
key: 'list:' + l.id,