summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2017-11-16 12:30:19 +0100
committerqsm-odoo <qsm@odoo.com>2017-11-17 17:04:00 +0100
commit8d5c4cb30d7f3cf37f6bd8bd396f47aa7f5c9287 (patch)
tree1f5fa4d80ac3e647c8791362da708adae44b8552
parent5b10f5dbc1182164bde3c3be462125f5338fe63b (diff)
[FIX] web: adapt JS boot logs to new Firefox version
When logging multiple elements in one log call in the new Firefox version, all the elements are kept on one line. So if the second element starts with a line feed, it will not go under the first element but still be at the right of the first element, on a new line.
-rw-r--r--addons/web/static/src/js/boot.js31
1 files changed, 21 insertions, 10 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 1f830ef254f..aa832711ca6 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -10,7 +10,7 @@
* only when the deferred is resolved, and its value is equal to the resolved value.
* The module can be rejected (unloaded). This will be logged in the console as info.
*
- * logs:
+ * logs:
* Missing dependencies:
* These modules do not appear in the page. It is possible that the
* JavaScript file is not in the page or that the module name is wrong
@@ -183,16 +183,27 @@
var failed = odoo.__DEBUG__.get_failed_jobs();
var unloaded = _.filter(debug_jobs, function (job) { return job.missing; });
- var log = [(_.isEmpty(failed) ? (_.isEmpty(unloaded) ? 'info' : 'warning' ) : 'error') + ':', 'Some modules could not be started'];
- if (missing.length) log.push('\nMissing dependencies: ', missing);
- if (!_.isEmpty(failed)) log.push('\nFailed modules: ', _.pluck(failed, 'name'));
- if (!_.isEmpty(rejected)) log.push('\nRejected modules: ', rejected);
- if (!_.isEmpty(rejected_linked))log.push('\nRejected linked modules:', rejected_linked);
- if (!_.isEmpty(unloaded)) log.push('\nNon loaded modules: ', _.pluck(unloaded, 'name'));
- if (odoo.debug && !_.isEmpty(debug_jobs)) log.push('\nDebug: ', debug_jobs);
-
if (odoo.debug || !_.isEmpty(failed) || !_.isEmpty(unloaded)) {
- console[_.isEmpty(failed) || _.isEmpty(unloaded) ? 'info' : 'error'].apply(console, log);
+ var log = console[_.isEmpty(failed) || _.isEmpty(unloaded) ? 'info' : 'error'].bind(console);
+ log((_.isEmpty(failed) ? (_.isEmpty(unloaded) ? 'info' : 'warning') : 'error') + ': Some modules could not be started');
+ if (missing.length) {
+ log('Missing dependencies: ', missing);
+ }
+ if (!_.isEmpty(failed)) {
+ log('Failed modules: ', _.pluck(failed, 'name'));
+ }
+ if (!_.isEmpty(rejected)) {
+ log('Rejected modules: ', rejected);
+ }
+ if (!_.isEmpty(rejected_linked)) {
+ log('Rejected linked modules: ', rejected_linked);
+ }
+ if (!_.isEmpty(unloaded)) {
+ log('Non loaded modules: ', _.pluck(unloaded, 'name'));
+ }
+ if (odoo.debug && !_.isEmpty(debug_jobs)) {
+ log('Debug: ', debug_jobs);
+ }
}
}
},