Added 'byte' as the smallest size, fixes S3 file size computing, etc.

avoidwork · Mar 2, 2012 · 829b250 · 829b250
1 parent 11f5015
commit 829b250
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/debug/filesize.js b/debug/filesize.js
@@ -29,7 +29,7 @@
  * filesize.js
  *
  * @author Jason Mulligan <jason.mulligan@avoidwork.com>
- * @version 1.0
+ * @version 1.1
  */
 (function (window) {
 	"use strict";
@@ -43,7 +43,7 @@
 	 */
 	var filesize = function (arg, pos) {
 		var num    = String(arg).indexOf(".") > -1 ? parseFloat(arg) : parseInt(arg),
-		    sizes  = [{"kB": 0}, {"MB": 1024}, {"GB": 1048576}, {"TB": 1073741824}],
+		    sizes  = [{"B": 0}, {"KB": 1024}, {"MB": 1048576}, {"GB": 1073741824}, {"TB": 1099511627776}],
 		    i      = sizes.length,
 		    result = "",
 		    size, suffix, n, x;
@@ -59,7 +59,7 @@
 				}
 			}
 			if (num >= size) {
-				result = (suffix === "kB" ? num : (num / size).toFixed(pos)) + suffix;
+				result = (suffix === "B" ? num : (num / size).toFixed(pos)) + suffix;
 				break;
 			}
 		}

diff --git a/production/filesize.js b/production/filesize.js
@@ -29,6 +29,6 @@
  * filesize.js
  *
  * @author Jason Mulligan <jason.mulligan@avoidwork.com>
- * @version 1.0
+ * @version 1.1
  */
-(function(a){"use strict";var b=function(a,b){var c=String(a).indexOf(".")>-1?parseFloat(a):parseInt(a),d=[{kB:0},{MB:1024},{GB:1048576},{TB:1073741824}],e=d.length,f="",g,h,i,j;b=typeof b=="undefined"?2:parseInt(b);while(e--){j=d[e];for(i in j)j.hasOwnProperty(i)&&(g=j[i],h=i);if(c>=g){f=(h==="kB"?c:(c/g).toFixed(b))+h;break}}return f};typeof define=="function"?define("filesize",[],function(){return b}):a.filesize=b})(window)
+(function(a){"use strict";var b=function(a,b){var c=String(a).indexOf(".")>-1?parseFloat(a):parseInt(a),d=[{B:0},{KB:1024},{MB:1048576},{GB:1073741824},{TB:1099511627776}],e=d.length,f="",g,h,i,j;b=typeof b=="undefined"?2:parseInt(b);while(e--){j=d[e];for(i in j)j.hasOwnProperty(i)&&(g=j[i],h=i);if(c>=g){f=(h==="B"?c:(c/g).toFixed(b))+h;break}}return f};typeof define=="function"?define("filesize",[],function(){return b}):a.filesize=b})(window)