From d589cd5aae502ad3b2371af0a4abcf0abeb33ac8 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 14 May 2014 03:49:15 -0400 Subject: [PATCH] refactor(cloudfunc) getShortSize --- lib/cloudfunc.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 5711930a..b9e6ee09 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -306,24 +306,24 @@ var Util; * гигайбайты и терабайты * @pSize - размер в байтах */ - this.getShortSize = function(pSize) { - if (pSize === pSize-0) { - /* Константы размеров, что используются внутри функции */ - var l1KB = 1024, - l1MB = l1KB * l1KB, - l1GB = l1MB * l1KB, - l1TB = l1GB * l1KB, - l1PB = l1TB * l1KB; - - if (pSize < l1KB) pSize = pSize + 'b'; - else if (pSize < l1MB) pSize = (pSize/l1KB).toFixed(2) + 'kb'; - else if (pSize < l1GB) pSize = (pSize/l1MB).toFixed(2) + 'mb'; - else if (pSize < l1TB) pSize = (pSize/l1GB).toFixed(2) + 'gb'; - else if (pSize < l1PB) pSize = (pSize/l1TB).toFixed(2) + 'tb'; - else pSize = (pSize/l1PB).toFixed(2) + 'pb'; + this.getShortSize = function(size) { + var isNumber = Util.isNumber(size), + l1KB = 1024, + l1MB = l1KB * l1KB, + l1GB = l1MB * l1KB, + l1TB = l1GB * l1KB, + l1PB = l1TB * l1KB; + + if (isNumber) { + if (size < l1KB) size = size + 'b'; + else if (size < l1MB) size = (size/l1KB).toFixed(2) + 'kb'; + else if (size < l1GB) size = (size/l1MB).toFixed(2) + 'mb'; + else if (size < l1TB) size = (size/l1GB).toFixed(2) + 'gb'; + else if (size < l1PB) size = (size/l1TB).toFixed(2) + 'tb'; + else size = (size/l1PB).toFixed(2) + 'pb'; } - return pSize; + return size; }; /** Функция получает адреса каждого каталога в пути