summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-01-12 16:16:51 +0100
committerChristophe Simonis <chs@odoo.com>2018-01-12 16:16:51 +0100
commitd35a76ee178102858417a80b781bbabdf6696df6 (patch)
tree226a9ca896908117f3d257427f5eecc57d211cc8 /addons/web/static/src/js/framework
parente671cdcc444e86f9ed413c33017b9c94e00d13d0 (diff)
parentd76237e038ac379ae96e2c72848a013731c3de03 (diff)
[MERGE] forward port branch 10.0 up to d76237e038a
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/utils.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js
index 0dc66c6817f..b5e812315ae 100644
--- a/addons/web/static/src/js/framework/utils.js
+++ b/addons/web/static/src/js/framework/utils.js
@@ -288,7 +288,7 @@ function human_size (size) {
size /= 1024;
++i;
}
- return size.toFixed(2) + ' ' + units[i];
+ return size.toFixed(2) + ' ' + units[i].trim();
}
/**