diff --git a/lib/filesize.js b/lib/filesize.js index ad2e8e0..bc84cf2 100644 --- a/lib/filesize.js +++ b/lib/filesize.js @@ -6,7 +6,7 @@ * @license BSD-3 * @link http://filesizejs.com * @module filesize - * @version 1.7.4 + * @version 1.7.5 */ (function (global) { @@ -24,16 +24,16 @@ var base = 10, bit, byte, i, neg, num, pos, regex, result, short, size, sizes, suffix, z, zero; - if (typeof arguments[2] !== "undefined") { + if (arguments[2] !== undefined) { pos = arguments[1]; short = arguments[2]; } else typeof arguments[1] === "boolean" ? short = arguments[1] : pos = arguments[1]; - if (isNaN(arg) || (typeof pos !== "undefined" && isNaN(pos))) throw Error("Invalid arguments"); + if (isNaN(arg) || (pos !== undefined && isNaN(pos))) throw Error("Invalid arguments"); short = (short === true); - pos = short ? 1 : (typeof pos === "undefined" ? 2 : parseInt(pos, base)); + pos = short ? 1 : (pos === undefined ? 2 : parseInt(pos, base)); num = Number(arg); neg = (num < 0); sizes = [["B", 0], ["Kb", 128], ["KB", 1024], ["Mb", 131072], ["MB", "1.049e+6"], ["Gb", "1.342e+8"], ["GB", "1.074e+9"], ["Tb", "1.374e+11"], ["TB", "1.1e+12"], ["Pb", "1.407e+14"], ["PB", "1.126e+15"]]; @@ -57,7 +57,7 @@ if (bit.test(suffix)) suffix = suffix.toLowerCase(); suffix = suffix.slice(0, 1); z = regex.exec(result); - if (z !== null && typeof z[1] !== "undefined" && zero.test(z[1])) result = parseInt(result, base); + if (z !== null && z[1] !== undefined && zero.test(z[1])) result = parseInt(result, base); } result += suffix; break; diff --git a/lib/filesize.min.js b/lib/filesize.min.js index 356e5b7..99fbb67 100644 --- a/lib/filesize.min.js +++ b/lib/filesize.min.js @@ -6,6 +6,6 @@ * @license BSD-3 * @link http://filesizejs.com * @module filesize - * @version 1.7.4 + * @version 1.7.5 */ -(function(e){"use strict";var t=function(e){var t=10,n,r,i,s,o,u,a,f,l,c,h,p,d,v;typeof arguments[2]!="undefined"?(u=arguments[1],l=arguments[2]):typeof arguments[1]=="boolean"?l=arguments[1]:u=arguments[1];if(isNaN(e)||typeof u!="undefined"&&isNaN(u))throw Error("Invalid arguments");l=l===!0,u=l?1:typeof u=="undefined"?2:parseInt(u,t),o=Number(e),s=o<0,h=[["B",0],["Kb",128],["KB",1024],["Mb",131072],["MB","1.049e+6"],["Gb","1.342e+8"],["GB","1.074e+9"],["Tb","1.374e+11"],["TB","1.1e+12"],["Pb","1.407e+14"],["PB","1.126e+15"]],i=h.length,f="",a=/\.(.*)/,n=/b$/,r=/^B$/,v=/^0$/,s&&(o=Math.abs(o));while(i--){c=h[i][1],p=h[i][0],i>3&&(c=Number(c));if(o>=c){f=(r.test(p)?o:o/c).toFixed(u),l&&(n.test(p)&&(p=p.toLowerCase()),p=p.slice(0,1),d=a.exec(f),d!==null&&typeof d[1]!="undefined"&&v.test(d[1])&&(f=parseInt(f,t))),f+=p;break}}return(s?"-":"")+f};switch(!0){case typeof exports!="undefined":module.exports=t;break;case typeof define=="function":define(function(){return t});break;default:e.filesize=t}})(this); \ No newline at end of file +(function(e){"use strict";var t=function(e){var t=10,n,r,i,s,o,u,a,f,l,c,h,p,d,v;arguments[2]!==undefined?(u=arguments[1],l=arguments[2]):typeof arguments[1]=="boolean"?l=arguments[1]:u=arguments[1];if(isNaN(e)||u!==undefined&&isNaN(u))throw Error("Invalid arguments");l=l===!0,u=l?1:u===undefined?2:parseInt(u,t),o=Number(e),s=o<0,h=[["B",0],["Kb",128],["KB",1024],["Mb",131072],["MB","1.049e+6"],["Gb","1.342e+8"],["GB","1.074e+9"],["Tb","1.374e+11"],["TB","1.1e+12"],["Pb","1.407e+14"],["PB","1.126e+15"]],i=h.length,f="",a=/\.(.*)/,n=/b$/,r=/^B$/,v=/^0$/,s&&(o=Math.abs(o));while(i--){c=h[i][1],p=h[i][0],i>3&&(c=Number(c));if(o>=c){f=(r.test(p)?o:o/c).toFixed(u),l&&(n.test(p)&&(p=p.toLowerCase()),p=p.slice(0,1),d=a.exec(f),d!==null&&d[1]!==undefined&&v.test(d[1])&&(f=parseInt(f,t))),f+=p;break}}return(s?"-":"")+f};switch(!0){case typeof exports!="undefined":module.exports=t;break;case typeof define=="function":define(function(){return t});break;default:e.filesize=t}})(this); \ No newline at end of file diff --git a/package.json b/package.json index 5d0d574..f3c4d42 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "filesize", "description": "JavaScript library to generate a human readable String describing the file size", - "version": "1.7.4", + "version": "1.7.5", "homepage": "http://filesizejs.com", "author": { "name": "Jason Mulligan", diff --git a/src/filesize.js b/src/filesize.js index 4a8106c..6be3748 100644 --- a/src/filesize.js +++ b/src/filesize.js @@ -13,16 +13,16 @@ var base = 10, bit, byte, i, neg, num, pos, regex, result, short, size, sizes, suffix, z, zero; - if (typeof arguments[2] !== "undefined") { + if (arguments[2] !== undefined) { pos = arguments[1]; short = arguments[2]; } else typeof arguments[1] === "boolean" ? short = arguments[1] : pos = arguments[1]; - if (isNaN(arg) || (typeof pos !== "undefined" && isNaN(pos))) throw Error("Invalid arguments"); + if (isNaN(arg) || (pos !== undefined && isNaN(pos))) throw Error("Invalid arguments"); short = (short === true); - pos = short ? 1 : (typeof pos === "undefined" ? 2 : parseInt(pos, base)); + pos = short ? 1 : (pos === undefined ? 2 : parseInt(pos, base)); num = Number(arg); neg = (num < 0); sizes = [["B", 0], ["Kb", 128], ["KB", 1024], ["Mb", 131072], ["MB", "1.049e+6"], ["Gb", "1.342e+8"], ["GB", "1.074e+9"], ["Tb", "1.374e+11"], ["TB", "1.1e+12"], ["Pb", "1.407e+14"], ["PB", "1.126e+15"]]; @@ -46,7 +46,7 @@ if (bit.test(suffix)) suffix = suffix.toLowerCase(); suffix = suffix.slice(0, 1); z = regex.exec(result); - if (z !== null && typeof z[1] !== "undefined" && zero.test(z[1])) result = parseInt(result, base); + if (z !== null && z[1] !== undefined && zero.test(z[1])) result = parseInt(result, base); } result += suffix; break;