diff options
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/core/owl_dialog.js | 22 | ||||
| -rw-r--r-- | addons/web/static/src/scss/modal.scss | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/addons/web/static/src/js/core/owl_dialog.js b/addons/web/static/src/js/core/owl_dialog.js index e6221e182c9..940c7c3b7d2 100644 --- a/addons/web/static/src/js/core/owl_dialog.js +++ b/addons/web/static/src/js/core/owl_dialog.js @@ -189,20 +189,18 @@ odoo.define('web.OwlDialog', function (require) { * @param {(LegacyDialog|OwlDialog)} dialog */ static display(dialog) { - // Deactivate previous dialog - const activeDialogEl = document.querySelector('.modal.o_active_modal'); - if (activeDialogEl) { - activeDialogEl.classList.remove('o_active_modal'); + const activeDialog = this.displayed[this.displayed.length - 1]; + if (activeDialog) { + // Deactivate previous dialog + const activeDialogEl = activeDialog instanceof this ? + // Owl dialog + activeDialog.modalRef.el : + // Legacy dialog + activeDialog.$modal[0]; + activeDialogEl.classList.add('o_inactive_modal'); } // Push dialog this.displayed.push(dialog); - // Add active class - const modalEl = dialog instanceof this ? - // Owl dialog - dialog.modalRef.el : - // Legacy dialog - dialog.$modal[0]; - modalEl.classList.add('o_active_modal'); // Update body class document.body.classList.add('modal-open'); } @@ -224,7 +222,7 @@ odoo.define('web.OwlDialog', function (require) { lastDialog.modalRef.el : // Legacy dialog lastDialog.$modal[0]; - modalEl.classList.add('o_active_modal'); + modalEl.classList.remove('o_inactive_modal'); } else { document.body.classList.remove('modal-open'); } diff --git a/addons/web/static/src/scss/modal.scss b/addons/web/static/src/scss/modal.scss index d82ddec6213..54bbbc2a696 100644 --- a/addons/web/static/src/scss/modal.scss +++ b/addons/web/static/src/scss/modal.scss @@ -106,8 +106,8 @@ } } -.modal:not(.o_active_modal) { - z-index: 1030; +.modal.o_inactive_modal { + z-index: $zindex-modal-backdrop - 1; } .o_dialog { |