summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2015-10-01 14:02:48 +0200
committerGéry Debongnie <ged@odoo.com>2015-10-01 14:02:48 +0200
commitf6c5da32b3d4a4f751b5a9de84a273bc20666408 (patch)
treee6aa5c2073ca652ea940ecd8551ad67559676b89 /addons/web/static/src/js
parent729c1fbec10fb9cec12de0d99fd262ea25da4d5a (diff)
parent0d91339b7bcb68781ee4b11c5474ed853f8c62bd (diff)
[MERGE] mail: refactoring of the chat interface
This merge is a large refactoring of the chat/channel code (client side code). A goal is to simplify the logic of updating chat windows, chatter and channels. A notable change is that it also disable the livechat js code, because it was not updated on time.
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/boot.js2
-rw-r--r--addons/web/static/src/js/framework/ajax.js4
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 80adf9874ca..c63acb01bdf 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -262,7 +262,7 @@
log_when_loaded();
}
});
- }, 100);
+ }, 1000);
};
$(log_when_loaded);
diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js
index d6619449a0f..869e0214ad9 100644
--- a/addons/web/static/src/js/framework/ajax.js
+++ b/addons/web/static/src/js/framework/ajax.js
@@ -15,7 +15,9 @@ function genericJsonRpc (fct_name, params, fct) {
var xhr = fct(data);
var result = xhr.pipe(function(result) {
if (result.error !== undefined) {
- console.error("Server application error", JSON.stringify(result.error));
+ if (result.error.data.arguments[0] !== "bus.Bus not available in test mode") {
+ console.error("Server application error", JSON.stringify(result.error));
+ }
return $.Deferred().reject("server", result.error);
} else {
return result.result;