summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2017-09-20 12:26:18 +0200
committerqsm-odoo <qsm@odoo.com>2017-09-20 15:03:56 +0200
commit7b965a9673a9124e6e045b8a290a156eed402ad5 (patch)
treea791aaf93119b04b5548c90cdcf28e87bd9eba4d /addons/web/static/src/js
parent26e079f246c196bc08669db3894c8b2c83cc2639 (diff)
[FIX] mail, web: chat window and emojis
- Fix several contexts where the emoji popover was hidden by a webclient element (control panel / ...). To solve this bug, the design has been improved to not use popover but instead use custom design (better integrated with new chatter design) - Chat window is now still usable when a modal is opened - Simplify chatter LESS
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/core/misc.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/addons/web/static/src/js/core/misc.js b/addons/web/static/src/js/core/misc.js
index 5f50ff27c6e..64ebeeb1794 100644
--- a/addons/web/static/src/js/core/misc.js
+++ b/addons/web/static/src/js/core/misc.js
@@ -54,19 +54,17 @@ if ($.blockUI) {
var throbbers = [];
-function blockUI () {
+function blockUI() {
var tmp = $.blockUI.apply($, arguments);
var throbber = new Throbber();
throbbers.push(throbber);
throbber.appendTo($(".oe_blockui_spin_container"));
- $('body').addClass('o_ui_blocked');
return tmp;
}
-function unblockUI () {
+function unblockUI() {
_.invoke(throbbers, 'destroy');
throbbers = [];
- $('body').removeClass('o_ui_blocked');
return $.unblockUI.apply($, arguments);
}
@@ -104,7 +102,7 @@ function redirect (url, wait) {
// * Client action to reload the whole interface.
// * If params.menu_id, it opens the given menu entry.
// * If params.wait, reload will wait the openerp server to be reachable before reloading
-
+
function Reload(parent, action) {
var params = action.params || {};
var menu_id = params.menu_id || false;