fix popup manager

This commit is contained in:
cookfront 2017-03-10 17:30:45 +08:00
parent 370a16383a
commit 97a593ff69
2 changed files with 14 additions and 20 deletions

View File

@ -72,7 +72,7 @@ export default {
beforeMount() { beforeMount() {
this._popupId = 'popup-' + popupContext.idSeed++; this._popupId = 'popup-' + popupContext.idSeed++;
PopupManager.register(this._popupId, this); PopupManager.register(this._popupId, this, popupContext);
}, },
data() { data() {

View File

@ -1,19 +1,12 @@
import Vue from 'vue'; import Vue from 'vue';
import { addClass } from 'src/utils/dom'; import { addClass } from 'src/utils/dom';
let popupContext;
if (Vue.prototype.$isServer) {
popupContext = global.popupContext || {};
} else {
popupContext = window.popupContext || {};
}
const getModal = function() { const getModal = function() {
let modalDom = PopupManager.modalDom; let modalDom = PopupManager.modalDom;
if (modalDom) { if (modalDom) {
popupContext.hasModal = true; PopupManager.popupContext.hasModal = true;
} else { } else {
popupContext.hasModal = false; PopupManager.popupContext.hasModal = false;
modalDom = document.createElement('div'); modalDom = document.createElement('div');
PopupManager.modalDom = modalDom; PopupManager.modalDom = modalDom;
@ -32,23 +25,24 @@ const getModal = function() {
const PopupManager = { const PopupManager = {
nextZIndex() { nextZIndex() {
return popupContext.zIndex++; return this.popupContext.zIndex++;
}, },
getInstance(id) { getInstance(id) {
return popupContext.instances[id]; return this.popupContext.instances[id];
}, },
register(id, instance) { register(id, instance, context) {
if (id && instance) { if (id && instance) {
popupContext.instances[id] = instance; this.popupContext = context;
this.popupContext.instances[id] = instance;
} }
}, },
deregister(id) { deregister(id) {
if (id) { if (id) {
popupContext.instances[id] = null; this.popupContext.instances[id] = null;
delete popupContext.instances[id]; delete this.popupContext.instances[id];
} }
}, },
@ -56,7 +50,7 @@ const PopupManager = {
* 遮罩层点击回调`closeOnClickOverlay``true`时会关闭当前`popup` * 遮罩层点击回调`closeOnClickOverlay``true`时会关闭当前`popup`
*/ */
handleOverlayClick() { handleOverlayClick() {
const topModal = popupContext.modalStack[popupContext.modalStack.length - 1]; const topModal = this.popupContext.modalStack[this.popupContext.modalStack.length - 1];
if (!topModal) return; if (!topModal) return;
const instance = PopupManager.getInstance(topModal.id); const instance = PopupManager.getInstance(topModal.id);
@ -68,7 +62,7 @@ const PopupManager = {
openModal(id, zIndex, dom) { openModal(id, zIndex, dom) {
if (!id || zIndex === undefined) return; if (!id || zIndex === undefined) return;
const modalStack = popupContext.modalStack; const modalStack = this.popupContext.modalStack;
for (let i = 0, len = modalStack.length; i < len; i++) { for (let i = 0, len = modalStack.length; i < len; i++) {
const item = modalStack[i]; const item = modalStack[i];
@ -88,11 +82,11 @@ const PopupManager = {
} }
modalDom.style.display = ''; modalDom.style.display = '';
popupContext.modalStack.push({ id: id, zIndex: zIndex }); this.popupContext.modalStack.push({ id: id, zIndex: zIndex });
}, },
closeModal(id) { closeModal(id) {
const modalStack = popupContext.modalStack; const modalStack = this.popupContext.modalStack;
const modalDom = getModal(); const modalDom = getModal();
if (modalStack.length > 0) { if (modalStack.length > 0) {