This commit is contained in:
syuilo
2020-09-06 14:25:42 +09:00
parent 73a94798c4
commit 26b16124e6
5 changed files with 72 additions and 82 deletions

View File

@@ -1,5 +1,5 @@
<template>
<x-modal ref="modal" @closed="$store.commit('removeDialog', id)" @click="onBgClick" :showing="showing">
<x-modal ref="modal" @closed="$store.commit('removePopup', id)" @click="onBgClick" :showing="showing">
<div class="mk-dialog" :class="{ iconOnly }">
<template v-if="type == 'signin'">
<mk-signin/>
@@ -160,7 +160,7 @@ export default defineComponent({
methods: {
done(canceled, result?) {
this.showing = false;
this.$store.commit('dialogDone', { id: this.id, result: { canceled, result } });
os.dialogCallbacks[this.id]({ canceled, result });
},
async ok() {

View File

@@ -1,5 +1,5 @@
<template>
<x-modal :source="source" :no-center="noCenter" ref="popup" @click="close()" @closed="$store.commit('removeDialog', id)" :showing="showing">
<x-modal :source="source" :no-center="noCenter" ref="popup" @click="close()" @closed="$store.commit('removePopup', id)" :showing="showing">
<div class="rrevdjwt" :class="{ left: align === 'left' }" ref="items" :style="{ width: width + 'px' }">
<template v-for="(item, i) in items.filter(item => item !== undefined)">
<div v-if="item === null" class="divider" :key="i"></div>
@@ -103,7 +103,6 @@ export default defineComponent({
},
close() {
this.showing = false;
this.$store.commit('dialogDone', { id: this.id });
},
focusUp() {
focusPrev(document.activeElement);