mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6031 from s0taka/master 

No decimal points for Kilobyte and Byte #5371.
This commit is contained in:
Morris Jobke 2014-01-05 11:52:10 -08:00
parent e2d739fa21 8fdc4585f7
commit ce3df44699
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/js/js.js
View File

@ -836,7 +836,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;

2
lib/private/helper.php
View File

@ -252,7 +252,7 @@ class OC_Helper {
if ($bytes < 1024) {
return "$bytes B";
}
$bytes = round($bytes / 1024, 1);
$bytes = round($bytes / 1024, 0);
if ($bytes < 1024) {
return "$bytes kB";
}