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

key.esc no modal and msgbox with promises (#4819) 

* Update popup-manager.js

keydown esc, when modal has beforeClose function

* Update popup-manager.js

msgBox.then

* Update popup-manager.js
pull/4851/head
patriciussanctus 2017-05-13 17:12:44 +03:00 committed by 杨奕
parent f2e8586f1a
commit 627e6cffaa
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/popup-manager.js
View File

@ -157,7 +157,7 @@ const PopupManager = {
const instance = PopupManager.getInstance(topItem.id); const instance = PopupManager.getInstance(topItem.id);
if (instance.closeOnPressEscape) { if (instance.closeOnPressEscape) {
instance.$emit('update:visible', false); instance.$emit('update:visible', false);
instance.close(); (instance.handleClose) ? instance.handleClose() : (instance.handleAction ? instance.handleAction('cancel') : instance.close());
} }
} }
} }