diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-02-17 09:48:33 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-02-17 09:51:42 +0100 |
| commit | f50807485125468f3da652097c9d0618cc8e4c8c (patch) | |
| tree | 8041ae0de8a493e349af0b6c629b20aa62394656 /addons/web/static/src/js/framework/utils.js | |
| parent | 929ff48e17d0cff8c2b77e24075d2f9be6a9ff2e (diff) | |
| parent | 715a5ba096082bde2f13dd5f8755f688cd9cdcec (diff) | |
[MERGE] web client: js libraries cleanup
Various steps have been taken to put the web client on a diet. Most
notably:
- remove many useless libraries
- custom builds for nvd3 and jquery ui
- remove web_editor (didn't work anyway)
- lazy loading of raphaeljs (for the diagram view)
Diffstat (limited to 'addons/web/static/src/js/framework/utils.js')
| -rw-r--r-- | addons/web/static/src/js/framework/utils.js | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js index a0ab37a7dfb..68291d41bbf 100644 --- a/addons/web/static/src/js/framework/utils.js +++ b/addons/web/static/src/js/framework/utils.js @@ -296,14 +296,19 @@ function human_size (size) { * * @param {Number} number */ -function human_number (number) { - var units = _t(",k,M").split(','); - var i = 0; - while (number >= 1000) { - number /= 1000; - ++i; +function human_number (number, decimals) { + var decimals = decimals | 0; + var number = Math.round(number); + var d2 = Math.pow(10, decimals); + var val = _t("kMGTPE"); + var i = val.length-1, s; + while( i ) { + s = Math.pow(10,i--*3); + if( s <= number ) { + number = Math.round(number*d2/s)/d2 + val[i]; + } } - return parseInt(number) + units[i]; + return number; } /** |
