From 1df7abfbb906f2e364b5eb5fefc5f9de5dd60026 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 18 Oct 2020 10:11:34 +0900 Subject: Improve waiting dialog --- src/client/pages/instance/emojis.vue | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/client/pages/instance') diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/instance/emojis.vue index 465a9ebe00..b254b65765 100644 --- a/src/client/pages/instance/emojis.vue +++ b/src/client/pages/instance/emojis.vue @@ -106,24 +106,13 @@ export default defineComponent({ async add(e) { const files = await selectFile(e.currentTarget || e.target, null, true); - const dialog = os.dialog({ - type: 'waiting', - text: this.$t('doing') + '...', - showOkButton: false, - showCancelButton: false, - cancelableByBgClick: false - }); - - Promise.all(files.map(file => os.api('admin/emoji/add', { + const promise = Promise.all(files.map(file => os.api('admin/emoji/add', { fileId: file.id, - }))) - .then(() => { + }))); + promise.then(() => { this.$refs.emojis.reload(); - os.success(); - }) - .finally(() => { - dialog.cancel(); }); + os.promiseDialog(promise); }, async edit(emoji) { -- cgit v1.2.3-freya