diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index ec55d15f70..1bcfa81a5f 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/packages/client/src/components/global/MkLoading.vue b/packages/client/src/components/global/MkLoading.vue
index 362484f5fc..dc61e577b1 100644
--- a/packages/client/src/components/global/MkLoading.vue
+++ b/packages/client/src/components/global/MkLoading.vue
@@ -15,10 +15,12 @@ const props = withDefaults(defineProps<{
inline?: boolean;
colored?: boolean;
mini?: boolean;
+ em?: boolean;
}>(), {
inline: false,
colored: true,
mini: false,
+ em: false,
});
@@ -70,6 +72,12 @@ const props = withDefaults(defineProps<{
padding: 16px;
--size: 32px;
}
+ &.em {
+ display: inline-block;
+ vertical-align: middle;
+ padding: 0;
+ --size: 1em;
+ }
}
.container {
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index d3516bf4ca..0e6bdf3182 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -7,8 +7,8 @@ import * as Misskey from "calckey-js";
import { apiUrl, url } from "@/config";
import MkPostFormDialog from "@/components/MkPostFormDialog.vue";
import MkWaitingDialog from "@/components/MkWaitingDialog.vue";
-import MkToast from '@/components/MkToast.vue';
-import MkDialog from '@/components/MkDialog.vue';
+import MkToast from "@/components/MkToast.vue";
+import MkDialog from "@/components/MkDialog.vue";
import { MenuItem } from "@/types/menu";
import { $i } from "@/account";
@@ -248,41 +248,56 @@ export function modalPageWindow(path: string) {
}
export function toast(message: string) {
- popup(MkToast, {
- message,
- }, {}, 'closed');
+ popup(
+ MkToast,
+ {
+ message,
+ },
+ {},
+ "closed",
+ );
}
export function alert(props: {
- type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
+ type?: "error" | "info" | "success" | "warning" | "waiting" | "question";
title?: string | null;
text?: string | null;
}): Promise {
return new Promise((resolve, reject) => {
- popup(MkDialog, props, {
- done: result => {
- resolve();
+ popup(
+ MkDialog,
+ props,
+ {
+ done: (result) => {
+ resolve();
+ },
},
- }, 'closed');
+ "closed",
+ );
});
}
export function confirm(props: {
- type: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
+ type: "error" | "info" | "success" | "warning" | "waiting" | "question";
title?: string | null;
text?: string | null;
okText?: string;
cancelText?: string;
}): Promise<{ canceled: boolean }> {
return new Promise((resolve, reject) => {
- popup(MkDialog, {
- ...props,
- showCancelButton: true,
- }, {
- done: result => {
- resolve(result ? result : { canceled: true });
+ popup(
+ MkDialog,
+ {
+ ...props,
+ showCancelButton: true,
},
- }, 'closed');
+ {
+ done: (result) => {
+ resolve(result ? result : { canceled: true });
+ },
+ },
+ "closed",
+ );
});
}