github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Popup: prepare for the upcoming change of Vue 2.2.0 (#3067)

pull/3147/head
杨奕 2017-02-28 16:30:08 +08:00 committed by baiyaaaaa
parent ae8ab4b56c
commit 705325c70a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/popup/index.js
View File

@ -144,7 +144,7 @@ export default {
this.$emit('input', true); this.$emit('input', true);
} }
const props = merge({}, this, options); const props = merge({}, this.$props || this, options);
if (this._closeTimer) { if (this._closeTimer) {
clearTimeout(this._closeTimer); clearTimeout(this._closeTimer);