From b4f563c38fc9bbc54cf1af17f7b162c6b5039889 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Fri, 25 Sep 2020 12:45:46 -0400 Subject: [PATCH] Revert "Fix opening modals from other modals. (#2263)" This reverts commit 1d7002a63f50a868750d1465fd485eb921cf660d. --- framework/core/js/src/common/components/Modal.js | 4 ++++ framework/core/js/src/common/components/ModalManager.js | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/framework/core/js/src/common/components/Modal.js b/framework/core/js/src/common/components/Modal.js index b554b255e..2a59beb01 100644 --- a/framework/core/js/src/common/components/Modal.js +++ b/framework/core/js/src/common/components/Modal.js @@ -27,6 +27,10 @@ export default class Modal extends Component { this.attrs.onshow(() => this.onready()); } + onremove() { + this.attrs.onhide(); + } + view() { if (this.alertAttrs) { this.alertAttrs.dismissible = false; diff --git a/framework/core/js/src/common/components/ModalManager.js b/framework/core/js/src/common/components/ModalManager.js index 8d13fe434..35922f70d 100644 --- a/framework/core/js/src/common/components/ModalManager.js +++ b/framework/core/js/src/common/components/ModalManager.js @@ -16,12 +16,6 @@ export default class ModalManager extends Component { ); } - onupdate() { - if (this.$('.Modal') && !this.attrs.state.modal) { - this.animateHide(); - } - } - oncreate(vnode) { super.oncreate(vnode);