diff options
| author | Géry Debongnie <ged@odoo.com> | 2015-10-01 14:02:48 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2015-10-01 14:02:48 +0200 |
| commit | f6c5da32b3d4a4f751b5a9de84a273bc20666408 (patch) | |
| tree | e6aa5c2073ca652ea940ecd8551ad67559676b89 /addons/web/static/src | |
| parent | 729c1fbec10fb9cec12de0d99fd262ea25da4d5a (diff) | |
| parent | 0d91339b7bcb68781ee4b11c5474ed853f8c62bd (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')
| -rw-r--r-- | addons/web/static/src/js/boot.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/framework/ajax.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/less/enterprise_compatibility.less | 19 | ||||
| -rw-r--r-- | addons/web/static/src/less/variables.less | 19 |
4 files changed, 23 insertions, 21 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; diff --git a/addons/web/static/src/less/enterprise_compatibility.less b/addons/web/static/src/less/enterprise_compatibility.less index b1cabee1a0c..7dc4238f684 100644 --- a/addons/web/static/src/less/enterprise_compatibility.less +++ b/addons/web/static/src/less/enterprise_compatibility.less @@ -8,27 +8,8 @@ // The problem is that we have two web clients in parallel, and every // addons should behave properly with both. -@odoo-brand-primary: #337ab7; -@odoo-brand-optional: @odoo-brand-primary; -@odoo-brand-secondary: #8f8f8f; -@odoo-brand-lightsecondary: #e2e2e0; -@odoo-list-grey: @odoo-brand-lightsecondary; // FIXME: listview thead background color -@odoo-webclient-background-color: #F0EEEE; -@odoo-view-background-color: white; -@odoo-shadow-color: #303030; @brand-primary: @odoo-brand-primary; -@odoo-font-size-base: 13px; -@odoo-font-size-base-touch: 15px; -@odoo-main-text-color: #555555; -@odoo-main-color-muted: #a8a8a8; - -@odoo-form-group-cols: 12; -@odoo-horizontal-padding: 16px; - -@screen-xs-min: 475px; -@screen-xxs-max: (@screen-xs-min - 1); - .oe-view-manager { background-color: @odoo-webclient-background-color !important; } diff --git a/addons/web/static/src/less/variables.less b/addons/web/static/src/less/variables.less new file mode 100644 index 00000000000..1984696aafb --- /dev/null +++ b/addons/web/static/src/less/variables.less @@ -0,0 +1,19 @@ +@odoo-brand-primary: #337ab7; +@odoo-brand-optional: @odoo-brand-primary; +@odoo-brand-secondary: #8f8f8f; +@odoo-brand-lightsecondary: #e2e2e0; +@odoo-list-grey: @odoo-brand-lightsecondary; // FIXME: listview thead background color +@odoo-webclient-background-color: #F0EEEE; +@odoo-view-background-color: white; +@odoo-shadow-color: #303030; + +@odoo-font-size-base: 13px; +@odoo-font-size-base-touch: 15px; +@odoo-main-text-color: #555555; +@odoo-main-color-muted: #a8a8a8; + +@odoo-form-group-cols: 12; +@odoo-horizontal-padding: 16px; + +@screen-xs-min: 475px; +@screen-xxs-max: (@screen-xs-min - 1); |
