summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-29 12:30:27 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-29 12:30:27 +0100
commit1c7f5a45e526142a9a2d6c752d81131a58e97148 (patch)
tree1cd3a1f74d7ef5f60e4549979f32f7ac9b554671 /addons/web/static/src/js/framework
parentb4638a91532e924158146a2e49a461890b77f87c (diff)
parentd0164570c11f1019099fbad23c3ac25fc959c153 (diff)
[MERGE] forward port of branch saas-7 up to d016457
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');