Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inlined the confirm.

Browse source
This commit is contained in:
Werner Kroneman 2024-12-07 14:28:00 +01:00
parent ffb2ec60ed
commit 88c8478f8c
1 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

68
packages/frontend/src/boot/main-boot.ts
View file

@ -3,27 +3,28 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { createApp, defineAsyncComponent, markRaw } from 'vue';
import { common } from './common.js';
import {createApp, defineAsyncComponent, markRaw} from 'vue';
import {common} from './common.js';
import type * as Misskey from 'misskey-js';
import { ui } from '@@/js/config.js';
import { i18n } from '@/i18n.js';
import { alert, confirm, popup, post, toast } from '@/os.js';
import { useStream } from '@/stream.js';
import {ui} from '@@/js/config.js';
import {i18n} from '@/i18n.js';
import {alert, popup, post} from '@/os.js';
import {useStream} from '@/stream.js';
import * as sound from '@/scripts/sound.js';
import { $i, signout, updateAccount } from '@/account.js';
import { instance } from '@/instance.js';
import { ColdDeviceStorage, defaultStore } from '@/store.js';
import { reactionPicker } from '@/scripts/reaction-picker.js';
import { miLocalStorage } from '@/local-storage.js';
import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js';
import { initializeSw } from '@/scripts/initialize-sw.js';
import { deckStore } from '@/ui/deck/deck-store.js';
import { emojiPicker } from '@/scripts/emoji-picker.js';
import { mainRouter } from '@/router/main.js';
import { setFavIconDot } from '@/scripts/favicon-dot.js';
import { type Keymap, makeHotkey } from '@/scripts/hotkey.js';
import { addCustomEmoji, removeCustomEmojis, updateCustomEmojis } from '@/custom-emojis.js';
import {$i, signout, updateAccount} from '@/account.js';
import {instance} from '@/instance.js';
import {ColdDeviceStorage, defaultStore} from '@/store.js';
import {reactionPicker} from '@/scripts/reaction-picker.js';
import {miLocalStorage} from '@/local-storage.js';
import {claimAchievement, claimedAchievements} from '@/scripts/achievements.js';
import {initializeSw} from '@/scripts/initialize-sw.js';
import {deckStore} from '@/ui/deck/deck-store.js';
import {emojiPicker} from '@/scripts/emoji-picker.js';
import {mainRouter} from '@/router/main.js';
import {setFavIconDot} from '@/scripts/favicon-dot.js';
import {type Keymap, makeHotkey} from '@/scripts/hotkey.js';
import {addCustomEmoji, removeCustomEmojis, updateCustomEmojis} from '@/custom-emojis.js';
import MkDialog from "@/components/MkDialog.vue";
export async function mainBoot() {
const { isClientUpdated } = await common(() => createApp(
@ -50,25 +51,20 @@ export async function mainBoot() {
if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {
if (reloadDialogShowing) return;
reloadDialogShowing = true;
const { canceled } = await new Promise(resolve => {
const {dispose} = popup(MkDialog, {
...({
type: 'warning',
title: i18n.ts.disconnectedFromServer,
text: i18n.ts.reloadConfirm,
}),
showCancelButton: true,
}, {
done: result => {
resolve(result ? result : {canceled: true});
},
closed: () => dispose(),
});
const {dispose} = popup(MkDialog, {
...({
type: 'warning',
title: i18n.ts.disconnectedFromServer,
text: i18n.ts.reloadConfirm,
}),
showCancelButton: true,
}, {
done: result => {
if (!result) location.reload();
},
closed: () => dispose(),
});
reloadDialogShowing = false;
if (!canceled) {
location.reload();
}
}
});