fix popup

2017-03-10 17:16:22 +08:00
parent ba53bc4c56
commit b2cf1d1eb2
2 changed files with 26 additions and 10 deletions
@@ -1,17 +1,21 @@
 import Vue from 'vue';
+import merge from 'src/utils/merge';
 import { addClass } from 'src/utils/dom';

-let popupContext = {
+let popupContext;
+if (Vue.prototype.$isServer) {
+  popupContext = global.popupContext || {};
+  global.popupContext = popupContext;
+} else {
+  popupContext = window.popupContext || {};
+  window.popupContext = popupContext;
+}
+
+popupContext = merge(popupContext, {
  hasModal: false,
  instances: {},
  modalStack: []
-};
-
-if (Vue.prototype.$isServer) {
-  global.popupContext = popupContext;
-} else {
-  window.popupContext = popupContext;
-}
+});

 const getModal = function() {
  let modalDom = PopupManager.modalDom;