From e3e5a4272bf4374174a276b478a9ace269fdf9e9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 3 Jan 2021 23:58:24 +0900 Subject: [PATCH] Fix search.ts --- src/client/components/sidebar.vue | 15 +-------------- src/client/os.ts | 4 ++-- src/client/scripts/search.ts | 22 +++++++++------------- 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue index 723bd85ae9..251f68527a 100644 --- a/src/client/components/sidebar.vue +++ b/src/client/components/sidebar.vue @@ -59,7 +59,6 @@ export default defineComponent({ return { host: host, showing: false, - searching: false, accounts: [], connection: null, menuDef: sidebarDef, @@ -125,19 +124,7 @@ export default defineComponent({ }, search() { - if (this.searching) return; - - os.dialog({ - title: this.$ts.search, - input: true - }).then(async ({ canceled, result: query }) => { - if (canceled || query == null || query === '') return; - - this.searching = true; - search(this, query).finally(() => { - this.searching = false; - }); - }); + search(); }, async openAccountMenu(ev) { diff --git a/src/client/os.ts b/src/client/os.ts index efdb11eb59..f7d870cfdd 100644 --- a/src/client/os.ts +++ b/src/client/os.ts @@ -97,8 +97,8 @@ export function apiWithDialog( export function promiseDialog>( promise: T, - onSuccess?: (res: any) => void, - onFailure?: (e: Error) => void, + onSuccess?: ((res: any) => void) | null, + onFailure?: ((e: Error) => void) | null, text?: string, ): T { const showing = ref(true); diff --git a/src/client/scripts/search.ts b/src/client/scripts/search.ts index 9607003715..3e442cb94d 100644 --- a/src/client/scripts/search.ts +++ b/src/client/scripts/search.ts @@ -3,19 +3,14 @@ import * as os from '@/os'; import { i18n } from '@/i18n'; import { router } from '@/router'; -export async function search(q?: string | null | undefined) { - if (q == null) { - const { canceled, result: query } = await os.dialog({ - title: i18n.locale.search, - input: true - }); +export async function search() { + const { canceled, result: query } = await os.dialog({ + title: i18n.locale.search, + input: true + }); + if (canceled || query == null || query === '') return; - if (canceled || query == null || query === '') return; - - q = query; - } - - q = q.trim(); + const q = query.trim(); if (q.startsWith('@') && !q.includes(' ')) { router.push(`/${q}`); @@ -39,7 +34,8 @@ export async function search(q?: string | null | undefined) { date.setHours(23, 59, 59, 999); } - v.$root.$emit('warp', date); + // TODO + //v.$root.$emit('warp', date); os.dialog({ icon: faHistory, iconOnly: true, autoClose: true