From 243f3f0c4c2831f4cf27c33f1d4cc748843d24da Mon Sep 17 00:00:00 2001 From: Simon Könnecke Date: Mon, 25 Nov 2013 12:26:03 +0100 Subject: No decimal points for Kilobyte and Byte #5371. --- core/js/js.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index f5991cfc9dd..b838e9578e7 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -825,7 +825,10 @@ function humanFileSize(size) { order = Math.min(humanList.length - 1, order); var readableFormat = humanList[order]; var relativeSize = (size / Math.pow(1024, order)).toFixed(1); - if(relativeSize.substr(relativeSize.length-2,2)=='.0'){ + if(order < 2){ + relativeSize = parseFloat(relativeSize).toFixed(0); + } + else if(relativeSize.substr(relativeSize.length-2,2)==='.0'){ relativeSize=relativeSize.substr(0,relativeSize.length-2); } return relativeSize + ' ' + readableFormat; -- cgit v1.2.3 From 8fdc4585f7545a95ac404af03179cf79452df1c9 Mon Sep 17 00:00:00 2001 From: Simon Könnecke Date: Wed, 18 Dec 2013 15:43:45 +0100 Subject: spaces to tabs --- core/js/js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index b838e9578e7..0af7073a0f0 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -827,7 +827,7 @@ function humanFileSize(size) { var relativeSize = (size / Math.pow(1024, order)).toFixed(1); if(order < 2){ relativeSize = parseFloat(relativeSize).toFixed(0); - } + } else if(relativeSize.substr(relativeSize.length-2,2)==='.0'){ relativeSize=relativeSize.substr(0,relativeSize.length-2); } -- cgit v1.2.3