Merge branch 'master' into 295

This commit is contained in:
Rijn Bian 2017-02-21 11:56:05 -06:00 committed by GitHub
commit 45ad8fb843
4 changed files with 32 additions and 15 deletions

View file

@ -1,6 +1,6 @@
<template>
<div :class="wrapClasses">
<div :class="maskClasses" v-show="visible" @click="mask" transition="fade"></div>
<div :class="maskClasses" v-show="visible" @click="mask" transition="fade"></div>
<div :class="wrapClasses" @click="handleWrapClick">
<div :class="classes" :style="styles" v-show="visible" transition="ease">
<div :class="[prefixCls + '-content']">
<a :class="[prefixCls + '-close']" v-if="closable" @click="close">
@ -130,6 +130,10 @@
this.close();
}
},
handleWrapClick (event) {
// use indexOf,do not use === ,because ivu-modal-wrap can have other custom className
if (event.target.getAttribute('class').indexOf(`${prefixCls}-wrap`) > -1) this.mask();
},
cancel () {
this.close();
},