blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

fix(Popup): close-on-popstate not work when deactivated

Browse Source
This commit is contained in:
chenjiahan 2020-02-25 19:02:19 +08:00
parent 51513d9423
commit f070773b42
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mixins/close-on-popstate.ts → src/mixins/close-on-popstate.js
View File

@ -1,10 +1,9 @@
import Vue from 'vue';
import { on, off } from '../utils/dom/event'; import { on, off } from '../utils/dom/event';
import { BindEventMixin } from './bind-event'; import { BindEventMixin } from './bind-event';
export const CloseOnPopstateMixin = Vue.extend({ export const CloseOnPopstateMixin = {
mixins: [ mixins: [
BindEventMixin(function(this: any, bind, isBind) { BindEventMixin(function(bind, isBind) {
this.handlePopstate(isBind && this.closeOnPopstate); this.handlePopstate(isBind && this.closeOnPopstate);
}), }),
], ],
@ -20,13 +19,13 @@ export const CloseOnPopstateMixin = Vue.extend({
}, },
watch: { watch: {
closeOnPopstate(val: boolean) { closeOnPopstate(val) {
this.handlePopstate(val); this.handlePopstate(val);
}, },
}, },
methods: { methods: {
handlePopstate(bind: boolean) { handlePopstate(bind) {
/* istanbul ignore if */ /* istanbul ignore if */
if (this.$isServer) { if (this.$isServer) {
return; return;
@ -35,8 +34,11 @@ export const CloseOnPopstateMixin = Vue.extend({
if (this.bindStatus !== bind) { if (this.bindStatus !== bind) {
this.bindStatus = bind; this.bindStatus = bind;
const action = bind ? on : off; const action = bind ? on : off;
action(window, 'popstate', (this as any).close); action(window, 'popstate', () => {
this.close();
this.shouldReopen = false;
});
} }
}, },
}, },
}); };