Skip to content

Commit f2f8813

Browse files
hunterliu1003hunterliu1003
committed
Merge branch 'dev'
2 parents a543d1b + de24c6c commit f2f8813

File tree

7 files changed

+41
-45
lines changed

7 files changed

+41
-45
lines changed

‎dist/VueFinalModal.esm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/VueFinalModal.esm.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/VueFinalModal.umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/VueFinalModal.umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/src/components/basic/VStopBeforeClose.vue

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,24 @@
66
content-class="modal-content"
77
@before-close="e => e.stop()"
88
>
9-
<template>
10-
<button class="modal__close" @click="showModal = false">
11-
<mdi-close></mdi-close>
9+
<button class="modal__close" @click="showModal = false">
10+
<mdi-close></mdi-close>
11+
</button>
12+
<span class="modal__title">Hello, vue-final-modal</span>
13+
<div class="modal__content">
14+
<p v-for="i in 5" :key="i">
15+
Vue Final Modal is a renderless, stackable, detachable and lightweight
16+
modal component.
17+
</p>
18+
</div>
19+
<div class="modal__action">
20+
<button class="vfm-btn" @click="showModal = false">
21+
confirm
1222
</button>
13-
<span class="modal__title">Hello, vue-final-modal</span>
14-
<div class="modal__content">
15-
<p v-for="i in 5" :key="i">
16-
Vue Final Modal is a renderless, stackable, detachable and
17-
lightweight modal component.
18-
</p>
19-
</div>
20-
<div class="modal__action">
21-
<button class="vfm-btn" @click="showModal = false">
22-
confirm
23-
</button>
24-
<button class="vfm-btn" @click="showModal = false">
25-
cancel
26-
</button>
27-
</div>
28-
</template>
23+
<button class="vfm-btn" @click="showModal = false">
24+
cancel
25+
</button>
26+
</div>
2927
</vue-final-modal>
3028
<button class="vfm-btn" @click="showModal = true">Open modal</button>
3129
</div>

‎example/src/components/basic/VStopBeforeOpen.vue

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,24 @@
66
content-class="modal-content"
77
@before-open="e => e.stop()"
88
>
9-
<template>
10-
<button class="modal__close" @click="showModal = false">
11-
<mdi-close></mdi-close>
9+
<button class="modal__close" @click="showModal = false">
10+
<mdi-close></mdi-close>
11+
</button>
12+
<span class="modal__title">Hello, vue-final-modal</span>
13+
<div class="modal__content">
14+
<p v-for="i in 5" :key="i">
15+
Vue Final Modal is a renderless, stackable, detachable and lightweight
16+
modal component.
17+
</p>
18+
</div>
19+
<div class="modal__action">
20+
<button class="vfm-btn" @click="showModal = false">
21+
confirm
1222
</button>
13-
<span class="modal__title">Hello, vue-final-modal</span>
14-
<div class="modal__content">
15-
<p v-for="i in 5" :key="i">
16-
Vue Final Modal is a renderless, stackable, detachable and
17-
lightweight modal component.
18-
</p>
19-
</div>
20-
<div class="modal__action">
21-
<button class="vfm-btn" @click="showModal = false">
22-
confirm
23-
</button>
24-
<button class="vfm-btn" @click="showModal = false">
25-
cancel
26-
</button>
27-
</div>
28-
</template>
23+
<button class="vfm-btn" @click="showModal = false">
24+
cancel
25+
</button>
26+
</div>
2927
</vue-final-modal>
3028
<button class="vfm-btn" @click="showModal = true">Open modal</button>
3129
</div>

‎lib/VueFinalModal.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ export default {
143143
}
144144
this.mounted()
145145
if (!value) {
146+
if (this.emitEvent('before-close', true)) {
147+
return
148+
}
146149
this.close()
147150
}
148151
},
@@ -206,9 +209,6 @@ export default {
206209
}
207210
},
208211
close() {
209-
if (this.emitEvent('before-close', true)) {
210-
return
211-
}
212212
if (this.api.openedModals.length > 0) {
213213
// If there are still nested modals opened
214214
const $_vm = this.api.openedModals[this.api.openedModals.length - 1]

0 commit comments

Comments
 (0)