From 94ec482e74d1c93a9792f95589e99a18795e6bee Mon Sep 17 00:00:00 2001 From: eldadfux Date: Wed, 7 Aug 2019 11:53:47 +0300 Subject: [PATCH] Fixed humansize filter --- public/dist/scripts/app-all.js | 6 +++--- public/dist/scripts/app.js | 6 +++--- public/scripts/filters.js | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index 50e83f02a..d282fedd9 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -2347,9 +2347,9 @@ Number.parseFloat(seconds).toFixed(0)+"s";} return"< 1s";}).add('nl2p',function($value){let result="

"+$value+"

";result=result.replace(/\r\n\r\n/g,"

").replace(/\n\n/g,"

");result=result.replace(/\r\n/g,"
").replace(/\n/g,"
");return result;}).add('markdown',function($value,markdown){return markdown.render($value);}).add('id2name',function($value){let members=container.get('members');if(members===null){return'';} for(let y=0;y=thresh&&u'+units[u]+'';}).add('statsTotal',function($value){if(!$value){return 0;} +return'';}).add('humanFileSize',function($value){if(!$value){return 0;} +let thresh=1000;if(Math.abs($value)=thresh&&u'+units[u]+'';}).add('statsTotal',function($value){if(!$value){return 0;} $value=abbreviate($value,1,false,false);return($value==='0')?'N/A':$value;});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);} let abbr;if(number>=1e12){abbr='T';} else if(number>=1e9){abbr='B';} diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js index 0dff2e754..ecabb54c9 100644 --- a/public/dist/scripts/app.js +++ b/public/dist/scripts/app.js @@ -254,9 +254,9 @@ Number.parseFloat(seconds).toFixed(0)+"s";} return"< 1s";}).add('nl2p',function($value){let result="

"+$value+"

";result=result.replace(/\r\n\r\n/g,"

").replace(/\n\n/g,"

");result=result.replace(/\r\n/g,"
").replace(/\n/g,"
");return result;}).add('markdown',function($value,markdown){return markdown.render($value);}).add('id2name',function($value){let members=container.get('members');if(members===null){return'';} for(let y=0;y=thresh&&u'+units[u]+'';}).add('statsTotal',function($value){if(!$value){return 0;} +return'';}).add('humanFileSize',function($value){if(!$value){return 0;} +let thresh=1000;if(Math.abs($value)=thresh&&u'+units[u]+'';}).add('statsTotal',function($value){if(!$value){return 0;} $value=abbreviate($value,1,false,false);return($value==='0')?'N/A':$value;});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);} let abbr;if(number>=1e12){abbr='T';} else if(number>=1e9){abbr='B';} diff --git a/public/scripts/filters.js b/public/scripts/filters.js index e448f8f8e..e6d20dfd9 100644 --- a/public/scripts/filters.js +++ b/public/scripts/filters.js @@ -112,26 +112,26 @@ window.ls.filter return ''; }) - .add('humanFileSize', function (bytes) { - if(!bytes) { + .add('humanFileSize', function ($value) { + if (!$value) { return 0; } let thresh = 1000; - if(Math.abs(bytes) < thresh) { - return bytes + ' B'; + if (Math.abs($value) < thresh) { + return $value + ' B'; } let units = ['kB','MB','GB','TB','PB','EB','ZB','YB']; let u = -1; do { - bytes /= thresh; + $value /= thresh; ++u; - } while(Math.abs(bytes) >= thresh && u < units.length - 1); + } while (Math.abs($value) >= thresh && u < units.length - 1); - return bytes.toFixed(1) + '' + units[u] + ''; + return $value.toFixed(1) + '' + units[u] + ''; }) .add('statsTotal', function ($value) { if(!$value) {