1
0
mirror of https://github.com/flarum/core.git synced 2025-08-24 00:53:27 +02:00

common: move modal manager clear code to clear method, and call it on micromodal close

This commit is contained in:
David Sevilla Martin
2020-03-11 18:50:22 -04:00
parent 2ca078618b
commit d29b5c7262
3 changed files with 11 additions and 10 deletions

View File

@@ -60,11 +60,13 @@ export default class ModalManager extends Component {
MicroModal.show('Modal', {
awaitCloseAnimation: true,
onClose: () => {
$('.modal-backdrop').fadeOut(200, function() {
$('.modal-backdrop').fadeOut(200, function(this: Element) {
this.remove();
});
this.showing = false;
this.clear();
},
});
@@ -89,10 +91,6 @@ export default class ModalManager extends Component {
// bit to give the `show` method the opportunity to prevent this from going
// ahead.
this.hideTimeout = setTimeout(() => MicroModal.close('Modal'));
this.modal = null;
this.component = null;
this.modalProps = {};
}
/**
@@ -103,7 +101,9 @@ export default class ModalManager extends Component {
this.component.onhide();
}
this.modal = null;
this.component = null;
this.modalProps = {};
// app.current.retain = false;