Merge pull request #53 from avoidwork/edge

Minor change
avoidwork · Mar 1, 2014 · a8966f8 · a8966f8
2 parents e41e93b + fd448ab
commit a8966f8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/lib/filesize.js b/lib/filesize.js
@@ -6,7 +6,7 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/filesize.js/master/LICENSE>
  * @link http://filesizejs.com
  * @module filesize
- * @version 2.0.2
+ * @version 2.0.3
  */
 ( function ( global ) {
 "use strict";
@@ -62,6 +62,12 @@ function filesize ( arg, descriptor ) {
 	else {
 		e = Math.floor( Math.log( num ) / Math.log( 1000 ) );
 
+		// Exceeding supported length, time to reduce & multiply
+		if ( e > 8 ) {
+			result = result * ( 1000 * ( e - 8 ) );
+			e      = 8;
+		}
+
 		if ( base === 2 ) {
 			result = num / Math.pow( 2, ( e * 10 ) );
 		}
@@ -121,8 +127,8 @@ function filesize ( arg, descriptor ) {
  * @type {Object}
  */
 var si = {
-	bits  : ["B", "kb", "Mb", "Gb", "Tb", "Pb"],
-	bytes : ["B", "kB", "MB", "GB", "TB", "PB"]
+	bits  : ["B", "kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"],
+	bytes : ["B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
 };
 
 // CommonJS, AMD, script tag

diff --git a/lib/filesize.map b/lib/filesize.map
@@ -2,7 +2,7 @@
 "version":3,
 "file":"filesize.min.js",
 "lineCount":9,
-"mappings":"A;;;;;;;AAUE,SAAS,CAAEA,CAAF,CAAW,CAgBtBC,QAASA,EAAS,CAAEC,CAAF,CAAOC,CAAP,CAAoB,CAAA,IACjCC,EAAS,EADwB,CAGjCC,CAHiC,CAGxBC,CAHwB,CAGlBC,CAHkB,CAGZC,CAHY,CAGPC,CAHO,CAGFC,CAHE,CAGKC,CAHL,CAGWC,CAHX,CAG8BC,CAEnE,IAAKC,KAAA,CAAOZ,CAAP,CAAL,CACC,KAAUa,MAAJ,CAAW,mBAAX,CAAN,CAGDZ,CAAA,CAAaA,CAAb,EAA2B,EAC3BG,EAAA,CAAmC,CAAA,CAAnC,GAAeH,CAAAG,KACfK,EAAA,CAAmC,CAAA,CAAnC,GAAeR,CAAAQ,KACfK,EAAA,CAAqCC,IAAAA,EAAxB,GAAAd,CAAAa,KAAA,CAAoCb,CAAAa,KAApC,CAA0DL,CAAA,CAAO,CAAP,CAAY,EACnFD,EAAA,CAAqCO,IAAAA,EAAxB,GAAAd,CAAAO,MAAA,CAAoCP,CAAAO,MAApC,CAA0DC,CAAA,CAAO,CAAP,CAAY,CACnFC,EAAA,CAAqCK,IAAAA,EAAxB,GAAAd,CAAAS,OAAA,CAAoCT,CAAAS,OAApC,CAA0DD,CAAA,CAAO,EAAP,CAAY,GACnFE,EAAA,CAAqCI,IAAAA,EAAxB,GAAAd,CAAAU,SAAA,CAAoCV,CAAAU,SAApC,CAA0D,EACvEJ,EAAA,CAAaS,MAAA,CAAQhB,CAAR,CACbM,EAAA,CAAqB,CAArB,CAAeC,CACfF,EAAA,CAAoB,CAAP,CAAAS,CAAA,CAAW,GAAX,CAAkB,IAG1BR,EAAL,GACCC,CADD,CACO,CAACA,CADR,CAKa,EAAb,GAAKA,CAAL,CACME,CAAL,CACCP,CADD,CACU,GADV,EAICe,CACA,CADS,GACT,CAAAf,CAAA,CAAS,GAAT,CAAeQ,CAAf,EAA0BC,CAAA,CAASM,CAAT,CAA1B,EAA8CA,CAA9C,CALD,CADD,EAUCd,CAqBA,CArBIe,IAAAC,MAAA,CAAYD,IAAAE,IAAA,CAAUb,CAAV,CAAZ,CAA8BW,IAAAE,IAAA,CAAU,GAAV,CAA9B,CAqBJ,CAlBClB,CAkBD,CAnBc,CAAd,GAAKY,CAAL,CACUP,CADV,CACgBW,IAAAG,IAAA,CAAU,CAAV,CAAmB,EAAnB,CAAelB,CAAf,CADhB,CAIUI,CAJV,CAIgBW,IAAAG,IAAA,CAAU,GAAV,CAAgBlB,CAAhB,CAehB,CAZKC,CAYL,GAXCF,CAEA,EAFoB,CAEpB,CAAKA,CAAL,CAAcG,CAAd,GACCH,CACA,EADkBG,CAClB,CAAAF,CAAA,EAFD,CASD,EAHAD,CAGA,CAHSA,CAAAoB,QAAA,CAAoB,CAAJ,CAAAnB,CAAA,CAAQK,CAAR,CAAgB,CAAhC,CAGT,CAFAS,CAEA,CAFSM,CAAA,CAAGnB,CAAA,CAAO,MAAP;AAAgB,OAAnB,CAAA,CAA4BD,CAA5B,CAET,CAAcM,CAAd,EACML,CAkBL,EAlBaoB,CAAAC,KAAA,CAAUR,CAAV,CAkBb,GAjBCA,CAiBD,CAjBUA,CAAAS,YAAA,EAiBV,EAdAT,CAcA,CAdSA,CAAAU,OAAA,CAAe,CAAf,CAcT,CAbAC,CAaA,CAbS1B,CAAA2B,QAAA,CAAgBC,CAAhB,CAAsB,EAAtB,CAaT,CAXgB,GAAhB,GAAKb,CAAL,CACCA,CADD,CACU,EADV,CAGWb,CAHX,EAG8B,GAH9B,GAGmBa,CAHnB,GAICA,CAJD,CAIU,GAJV,CAWA,CAJKc,CAAAN,KAAA,CAAWG,CAAX,CAIL,GAHC1B,CAGD,CAHU8B,QAAA,CAAU9B,CAAV,CAAkB+B,CAAlB,CAGV,EAAA/B,CAAA,EAAUQ,CAAV,EAAqBC,CAAA,CAASM,CAAT,CAArB,EAAyCA,CAAzC,CAnBD,EAqBWR,CArBX,GAsBCP,CAtBD,EAsBWQ,CAtBX,EAsBsBC,CAAA,CAASM,CAAT,CAtBtB,EAsB0CA,CAtB1C,EA/BD,CA0DKX,EAAL,GACCJ,CADD,CACU,GADV,CACgBA,CADhB,CAIA,OAAOA,EAxF8B,CAhBhB,IAGlBsB,EAAQ,IAHU,CAIlBS,EAAQ,EAJU,CAKlBH,EAAQ,MALU,CAMlBC,EAAQ,KANU,CAgHlBR,EAAK,MACA,kBAAA,MAAA,CAAA,GAAA,CADA,OAEA,kBAAA,MAAA,CAAA,GAAA,CAFA,CAMe,YAAxB,GAAK,MAAOW,QAAZ,CACCC,MAAAD,QADD,CACkBnC,CADlB,CAG4B,UAAvB,GAAK,MAAOqC,OAAZ,CACJA,MAAA,CAAQ,QAAS,EAAG,CACnB,MAAOrC,EADY,CAApB,CADI,CAMJD,CAAAC,SANI,CAMcA,CA/HG,CAApB,CAAA,CAkIG,IAlIH;",
+"mappings":"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",
 "sources":["filesize.js"],
 "names":["global","filesize","arg","descriptor","result","e","bits","ceil","neg","num","round","unix","spacer","suffixes","isNaN","Error","base","undefined","Number","suffix","Math","floor","log","pow","toFixed","si","bit","test","toLowerCase","charAt","z","replace","left","zero","parseInt","radix","exports","module","define"]
 }
diff --git a/lib/filesize.min.js b/lib/filesize.min.js
diff --git 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": "2.0.2",
+  "version": "2.0.3",
   "homepage": "http://filesizejs.com",
   "author": {
     "name": "Jason Mulligan",

diff --git a/src/filesize.js b/src/filesize.js
@@ -44,6 +44,12 @@ function filesize ( arg, descriptor ) {
 	else {
 		e = Math.floor( Math.log( num ) / Math.log( 1000 ) );
 
+		// Exceeding supported length, time to reduce & multiply
+		if ( e > 8 ) {
+			result = result * ( 1000 * ( e - 8 ) );
+			e      = 8;
+		}
+
 		if ( base === 2 ) {
 			result = num / Math.pow( 2, ( e * 10 ) );
 		}

diff --git a/src/si.js b/src/si.js
@@ -4,6 +4,6 @@
  * @type {Object}
  */
 var si = {
-	bits  : ["B", "kb", "Mb", "Gb", "Tb", "Pb"],
-	bytes : ["B", "kB", "MB", "GB", "TB", "PB"]
+	bits  : ["B", "kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"],
+	bytes : ["B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
 };