diff --git a/json/config.json b/json/config.json index 2c46b714..ca8c936c 100644 --- a/json/config.json +++ b/json/config.json @@ -2,7 +2,7 @@ "api_url" : "/api/v1", "appcache" : false, "minification" : { - "js" : true, + "js" : false, "css" : true, "html" : true, "img" : true diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index ec50c67b..63afa94e 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -158,19 +158,21 @@ var CloudFunc, exports; * @pSize - размер в байтах */ CloudFunc.getShortSize = function(pSize){ - /* Константы размеров, что используются внутри функции */ - 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'; + 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'; + } return pSize; };