summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-02 14:55:52 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-02 14:55:52 +0100
commit04416a5a6f1a3b4cf1a8bed8e9aee9c30c91a03e (patch)
tree1fd974be09d12c53ed02a221de553f6f83efc253 /addons/web/static/src/js/framework
parent7e3d6e92b6a7af27d8c2ebb0dbbecba28c9f1877 (diff)
parent469e04e97c2aa60d9d41bd430e0aeba77ee6f9dd (diff)
[MERGE] forward port of branch saas-9 up to 469e04e
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/misc.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/web/static/src/js/framework/misc.js b/addons/web/static/src/js/framework/misc.js
index fd6bb6d6288..25e80c33e84 100644
--- a/addons/web/static/src/js/framework/misc.js
+++ b/addons/web/static/src/js/framework/misc.js
@@ -93,12 +93,14 @@ function blockUI () {
var throbber = new Throbber();
throbbers.push(throbber);
throbber.appendTo($(".oe_blockui_spin_container"));
+ $('body').addClass('o_ui_blocked');
return tmp;
}
function unblockUI () {
_.invoke(throbbers, 'destroy');
throbbers = [];
+ $('body').removeClass('o_ui_blocked');
return $.unblockUI.apply($, arguments);
}