github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-10 04:05:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure that readyCallback is called on modals opened from other modals

Browse Source
This commit is contained in:
Alexander Skvortsov 2020-09-25 13:00:44 -04:00
parent 822ace668a
commit 5127e7d063
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/js/src/common/components/ModalManager.js
View File

@ -28,6 +28,13 @@ export default class ModalManager extends Component {
animateShow(readyCallback) { animateShow(readyCallback) {
const dismissible = !!this.attrs.state.modal.componentClass.isDismissible; const dismissible = !!this.attrs.state.modal.componentClass.isDismissible;
// If we are opening this modal while another modal is already open,
// the shown event will not run, because the modal is already open.
// So, we need to manually trigger the readyCallback.
if (this.$().hasClass('in')) {
readyCallback();
}
this.$() this.$()
.one('shown.bs.modal', readyCallback) .one('shown.bs.modal', readyCallback)
.modal({ .modal({