ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-12-24 02:02:09 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

dalete merge && class operating methods

Browse Source
This commit is contained in:
陈嘉涵
2017-08-22 19:43:15 +08:00
parent 9bb88ee295
commit bc169e905a
7 changed files with 21 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/mixins/popup/index.js
View File

@@ -1,4 +1,3 @@
import merge from '../../utils/merge';
import PopupManager from './popup-manager';
import PopupContext from './popup-context';

6
packages/mixins/popup/popup-context.js
View File

@@ -1,4 +1,3 @@
import merge from '../../utils/merge';
import Vue from 'vue';
let context;
@@ -16,7 +15,10 @@ const DEFAULT_CONTEXT = {
modalStack: []
};
context = _global.popupContext = merge({}, DEFAULT_CONTEXT, context);
context = _global.popupContext = {
...DEFAULT_CONTEXT,
...context
};
const PopupContext = {
getContext(key) {

3
packages/mixins/popup/popup-manager.js
View File

@@ -1,5 +1,4 @@
import Vue from 'vue';
import { addClass } from '../../utils/dom';
import PopupContext from './popup-context';
const getModal = function() {
@@ -79,7 +78,7 @@ const PopupManager = {
const modalDom = getModal();
addClass(modalDom, 'van-modal');
modalDom.classList.add('van-modal');
let domParentNode;
if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {