natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

will fix?

This commit is contained in:
ThatOneCalculator 2023-02-18 16:28:50 -08:00
parent 7132ad2285
commit 3118825fa9
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/MkUpdated.vue
View File

@ -6,7 +6,7 @@
<div v-if="newRelease" class="releaseNotes"> <div v-if="newRelease" class="releaseNotes">
<Mfm :text="data.notes"/> <Mfm :text="data.notes"/>
<div v-if="data.screenshots.length > 0" style="max-width: 500"> <div v-if="data.screenshots.length > 0" style="max-width: 500">
<img v-for="i in data.screenshots" :key="i" :src="i"/> <img v-for="i in data.screenshots" :key="i" :src="i" alt="screenshot"/>
</div> </div>
</div> </div>
<MkButton class="gotIt" primary full @click="modal.close()">{{ i18n.ts.gotIt }}</MkButton> <MkButton class="gotIt" primary full @click="modal.close()">{{ i18n.ts.gotIt }}</MkButton>

41
packages/client/src/os.ts
View File

@ -7,6 +7,8 @@ import * as Misskey from "calckey-js";
import { apiUrl, url } from "@/config"; import { apiUrl, url } from "@/config";
import MkPostFormDialog from "@/components/MkPostFormDialog.vue"; import MkPostFormDialog from "@/components/MkPostFormDialog.vue";
import MkWaitingDialog from "@/components/MkWaitingDialog.vue"; import MkWaitingDialog from "@/components/MkWaitingDialog.vue";
import MkToast from '@/components/MkToast.vue';
import MkDialog from '@/components/MkDialog.vue';
import { MenuItem } from "@/types/menu"; import { MenuItem } from "@/types/menu";
import { $i } from "@/account"; import { $i } from "@/account";
@ -246,54 +248,41 @@ export function modalPageWindow(path: string) {
} }
export function toast(message: string) { export function toast(message: string) {
popup( popup(MkToast, {
defineAsyncComponent(() => import("@/components/MkToast.vue")),
{
message, message,
}, }, {}, 'closed');
{},
"closed",
);
} }
export function alert(props: { export function alert(props: {
type?: "error" | "info" | "success" | "warning" | "waiting" | "question"; type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
title?: string | null; title?: string | null;
text?: string | null; text?: string | null;
}): Promise<void> { }): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
popup( popup(MkDialog, props, {
defineAsyncComponent(() => import("@/components/MkDialog.vue")), done: result => {
props,
{
done: (result) => {
resolve(); resolve();
}, },
}, }, 'closed');
"closed",
);
}); });
} }
export function confirm(props: { export function confirm(props: {
type: "error" | "info" | "success" | "warning" | "waiting" | "question"; type: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
title?: string | null; title?: string | null;
text?: string | null; text?: string | null;
okText?: string;
cancelText?: string;
}): Promise<{ canceled: boolean }> { }): Promise<{ canceled: boolean }> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
popup( popup(MkDialog, {
defineAsyncComponent(() => import("@/components/MkDialog.vue")),
{
...props, ...props,
showCancelButton: true, showCancelButton: true,
}, }, {
{ done: result => {
done: (result) => {
resolve(result ? result : { canceled: true }); resolve(result ? result : { canceled: true });
}, },
}, }, 'closed');
"closed",
);
}); });
} }