summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/components/dropdown_menu.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/components/dropdown_menu.js b/addons/web/static/src/js/components/dropdown_menu.js
index 8c1676d8952..890d928b19f 100644
--- a/addons/web/static/src/js/components/dropdown_menu.js
+++ b/addons/web/static/src/js/components/dropdown_menu.js
@@ -128,8 +128,12 @@ odoo.define('web.DropdownMenu', function (require) {
) {
if (document.body.classList.contains("modal-open")) {
// retrieve the active modal and check if the dropdown is a child of this modal
- const modal = document.querySelector('.modal:not(.o_inactive_modal)');
- if (!modal.contains(this.el)) {
+ const modal = document.querySelector('body > .modal:not(.o_inactive_modal)');
+ if (modal && !modal.contains(this.el)) {
+ return;
+ }
+ const owlModal = document.querySelector('body > .o_dialog > .modal:not(.o_inactive_modal)');
+ if (owlModal && !owlModal.contains(this.el)) {
return;
}
}