summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-24 18:50:09 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-24 18:50:09 +0100
commit3b6c243440aad5390a72c76224ec901a2cc49054 (patch)
tree5d0babdf492769a8104042cb837807e5ff13178b /addons/web/static/src/js/framework
parentf2855c6c42a9d71ddb62b616f35461a1e92ed87a (diff)
parentc169c59e6976e350ee778d6aa69973ac00b52495 (diff)
[MERGE] forward port of branch 9.0 up to c169c59
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/dialog.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/framework/dialog.js b/addons/web/static/src/js/framework/dialog.js
index b5e63834614..cd4540af270 100644
--- a/addons/web/static/src/js/framework/dialog.js
+++ b/addons/web/static/src/js/framework/dialog.js
@@ -137,7 +137,7 @@ var Dialog = Widget.extend({
this.$modal.remove();
setTimeout(function () { // Keep class modal-open (deleted by bootstrap hide fnct) on body to allow scrolling inside the modal
- var modals = $('body > .modal');
+ var modals = $('body > .modal').filter(':visible');
if(modals.length) {
modals.last().focus();
$('body').addClass('modal-open');