Skip to content

Commit

Permalink
Correcting kilobit & kilobyte symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
@avoidwork
avoidwork committed Jul 5, 2013
1 parent baa4450 commit 223b8ea
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 30 deletions.
12 changes: 8 additions & 4 deletions lib/filesize.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @license BSD-3 <https://raw.github.com/avoidwork/filesize.js/master/LICENSE>
* @link http://filesizejs.com
* @module filesize
* @version 1.9.5
* @version 1.9.6
*/
( function ( global ) {
"use strict";
Expand All @@ -20,11 +20,11 @@

options = {
all : {
increments : [["B", 1], ["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]],
increments : [["B", 1], ["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]],
nth : 11
},
bitless : {
increments : [["B", 1], ["KB", 1024], ["MB", 1.049e+6], ["GB", 1.074e+9], ["TB", 1.1e+12], ["PB", 1.126e+15]],
increments : [["B", 1], ["kB", 1024], ["MB", 1.049e+6], ["GB", 1.074e+9], ["TB", 1.1e+12], ["PB", 1.126e+15]],
nth : 6
}
};
Expand All @@ -37,7 +37,7 @@
* @param {Boolean} bits [Optional] Determines if `bit` sizes are used for result calculation, default is true
* @return {String} Readable file size String
*/
function filesize (arg) {
function filesize ( arg) {
var result = "",
bits = true,
skip = false,
Expand Down Expand Up @@ -112,6 +112,10 @@
suffix = suffix.charAt( 0 );
z = right.exec( result );

if ( suffix === "k" ) {
suffix = "K";
}

if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
result = parseInt( result, base );
}
Expand Down
2 changes: 1 addition & 1 deletion lib/filesize.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version":3,
"file":"filesize.min.js",
"lineCount":10,
"mappings":"A;;;;;;;AAUE,SAAS,CAAEA,CAAF,CAAW,CA6BrBC,QAASA,EAAS,CAACC,CAAD,OAAM,CAAA,IACnBC,EAAS,EADU,CAEnBC,EAAS,CAAA,CAFU,CAGnBC,EAAS,CAAA,CAHU,CAINC,CAJM,CAIDC,CAJC,CAIKC,CAJL,CAIWC,CAGbC,KAAAA,EAArB,GAAI,CAAJ,EACCJ,CAEA,CAFO,CAEP,CADAC,CACA,CADO,CACP,CAAAH,CAAA,CAAO,CAHR,GAMyB,SAAxB,GAAA,MAAO,EAAP,CAAoCG,CAApC,CAA2C,CAA3C,CAA0DD,CAA1D,CAAgE,CAEhE,CAA6B,SAA7B,GAAK,MAAO,EAAZ,GACCF,CADD,CACQ,CADR,CARD,CAaA,IAAKO,KAAA,CAAOT,CAAP,CAAL,EAA+BQ,IAAAA,EAA/B,GAAuBJ,CAAvB,EAA4CK,KAAA,CAAOL,CAAP,CAA5C,CACC,KAAUM,MAAJ,CAAU,mBAAV,CAAN,CAGDL,CAAA,CAAkB,CAAA,CAAlB,GAASA,CACTH,EAAA,CAAkB,CAAA,CAAlB,GAASA,CACTE,EAAA,CAAOC,CAAA,CAAO,CAAP,CAAqBG,IAAAA,EAAR,GAAAJ,CAAA,CAAoB,CAApB,CAAwBO,QAAA,CAAUP,CAAV,CAAeQ,CAAf,CAC5CC,EAAA,CAAOC,MAAA,CAAQd,CAAR,CAIP,EAHAe,CAGA,CAHe,CAGf,CAHSF,CAGT,IACCA,CADD,CACO,CAACA,CADR,CAKA,IAAa,CAAb,GAAKA,CAAL,CAEEZ,CAAA,CADII,CAAL,CACU,GADV,CAIU,KALX,KAQK,CACCH,CAAL,EACCK,CACA,CADQS,CAAAC,IAAAC,WACR,CAAAC,CAAA,CAAQH,CAAAC,IAAAG,IAFT,GAKCb,CACA,CADQS,CAAAK,QAAAH,WACR,CAAAC,CAAA,CAAQH,CAAAK,QAAAD,IANT,CASA,KAAA,CAAQD,CAAA,EAAR,CAAA,CAIC,GAHAb,CAGK,CAHIC,CAAA,CAAMY,CAAN,CAAA,CAAS,CAAT,CAGJ,CAFLG,CAEK,CAFIf,CAAA,CAAMY,CAAN,CAAA,CAAS,CAAT,CAEJ,CAAAN,CAAA,EAAOP,CAAZ,CAAmB,CAEbiB,CAAAC,KAAA,CAAWF,CAAX,CAAL,GACCnB,CACA,CADO,CAAA,CACP,CAAAC,CAAA,CAAO,CAFR,CAKAH,EAAA,CAAWwB,CAAAZ,CAAAY,CAAMnB,CAANmB,SAAA,CAAsBrB,CAAtB,CAEN,EAACD,CAAN,EAAcE,CAAd,EACMH,CAWL,EAXawB,CAAAF,KAAA,CAAUF,CAAV,CAWb,GAVCA,CAUD,CAVUA,CAAAK,YAAA,EAUV;AAPAL,CAOA,CAPSA,CAAAM,OAAA,CAAe,CAAf,CAOT,CANAC,CAMA,CANSC,CAAAC,KAAA,CAAY9B,CAAZ,CAMT,CAJW,IAIX,GAJK4B,CAIL,GAJ4BrB,IAAAA,EAI5B,GAJmBqB,CAAA,CAAE,CAAF,CAInB,EAJyCG,CAAAR,KAAA,CAAWK,CAAA,CAAE,CAAF,CAAX,CAIzC,IAHC5B,CAGD,CAHUU,QAAA,CAAUV,CAAV,CAAkBW,CAAlB,CAGV,EAAAX,CAAA,EAAUqB,CAZX,EAcWjB,CAdX,GAeCJ,CAfD,EAeW,GAfX,CAeiBqB,CAfjB,CAiBA,MA1BkB,CAdhB,CA8CAP,CAAL,GACCd,CADD,CACU,GADV,CACgBA,CADhB,CAIA,OAAOA,EA9FgB,CA7BH,IAGjBW,EAAU,EAHO,CAIjBkB,EAAU,QAJO,CAKjBJ,EAAU,IALO,CAMjBH,EAAU,KANO,CAOjBS,EAAU,KAPO,CAQjBhB,CAEJA,EAAA,CAAU,KACH,YACQ,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAwB,CAAC,IAAD,CAAO,IAAP,CAAxB,CAAsC,CAAC,IAAD,CAAO,MAAP,CAAtC,CAAsD,CAAC,IAAD,CAAO,MAAP,CAAtD,CAAwE,CAAC,IAAD,CAAO,MAAP,CAAxE,CAA0F,CAAC,IAAD,CAAO,MAAP,CAA1F,CAA4G,CAAC,IAAD,CAAO,MAAP,CAA5G,CAA+H,CAAC,IAAD,CAAO,KAAP,CAA/H,CAAgJ,CAAC,IAAD,CAAO,OAAP,CAAhJ,CAAmK,CAAC,IAAD,CAAO,OAAP,CAAnK,CADR,KAEQ,EAFR,CADG,SAKC,YACI,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,IAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,MAAP,CAAzB,CAA2C,CAAC,IAAD,CAAO,MAAP,CAA3C,CAA6D,CAAC,IAAD,CAAO,KAAP,CAA7D,CAA8E,CAAC,IAAD,CAAO,OAAP,CAA9E,CADJ,KAEI,CAFJ,CALD,CAqHc,YAAxB,GAAK,MAAOiB,QAAZ,CACCC,MAAAD,QADD;AACkBlC,CADlB,CAG4B,UAAvB,GAAK,MAAOoC,OAAZ,CACJA,MAAA,CAAQ,QAAS,EAAG,CACnB,MAAOpC,EADY,CAApB,CADI,CAMJD,CAAAC,SANI,CAMcA,CAxIE,CAApB,CAAA,CA0IE,IA1IF;",
"mappings":"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",
"sources":["filesize.js"],
"names":["global","filesize","arg","result","bits","skip","pos","shrt","size","sizes","undefined","isNaN","Error","parseInt","base","num","Number","neg","options","all","increments","i","nth","bitless","suffix","bite","test","toFixed","bit","toLowerCase","charAt","z","right","exec","zero","exports","module","define"]
}
6 changes: 3 additions & 3 deletions lib/filesize.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "filesize",
"description": "JavaScript library to generate a human readable String describing the file size",
"version": "1.9.5",
"version": "1.9.6",
"homepage": "http://filesizejs.com",
"author": {
"name": "Jason Mulligan",
Expand Down Expand Up @@ -37,5 +37,5 @@
"grunt-contrib-nodeunit": "~0.1.2",
"grunt-contrib-watch": "~0.2"
},
"keywords": ["file", "filesize", "size", "readable", "filesystem"]
"keywords": ["file", "filesize", "size", "readable", "file system"]
}
10 changes: 7 additions & 3 deletions src/filesize.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

options = {
all : {
increments : [["B", 1], ["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]],
increments : [["B", 1], ["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]],
nth : 11
},
bitless : {
increments : [["B", 1], ["KB", 1024], ["MB", 1.049e+6], ["GB", 1.074e+9], ["TB", 1.1e+12], ["PB", 1.126e+15]],
increments : [["B", 1], ["kB", 1024], ["MB", 1.049e+6], ["GB", 1.074e+9], ["TB", 1.1e+12], ["PB", 1.126e+15]],
nth : 6
}
};
Expand All @@ -27,7 +27,7 @@
* @param {Boolean} bits [Optional] Determines if `bit` sizes are used for result calculation, default is true
* @return {String} Readable file size String
*/
function filesize (arg) {
function filesize ( arg) {
var result = "",
bits = true,
skip = false,
Expand Down Expand Up @@ -102,6 +102,10 @@
suffix = suffix.charAt( 0 );
z = right.exec( result );

if ( suffix === "k" ) {
suffix = "K";
}

if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
result = parseInt( result, base );
}
Expand Down
34 changes: 17 additions & 17 deletions test/filesize_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports["filesize"] = {
this.num = 1024;
this.str = "1024";
this.invld = "abc";
this.Kb = 500;
this.kb = 500;
this.neg = -1024;
this.byte = 1;
this.zero = 0;
Expand All @@ -14,29 +14,29 @@ exports["filesize"] = {
valid: function (test) {
test.expect(28);

test.equal(filesize(this.Kb), "3.91 Kb", "Should be '3.91 Kb'");
test.equal(filesize(this.Kb, 1), "3.9 Kb", "Should be '3.9 Kb'");
test.equal(filesize(this.Kb, 1, false), "500 B", "Should be '500 B'");
test.equal(filesize(this.Kb, true), "3.9k", "Should be '3.9k'");
test.equal(filesize(this.Kb, true, false), "500", "Should be '500'");
test.equal(filesize(this.kb), "3.91 kb", "Should be '3.91 kb'");
test.equal(filesize(this.kb, 1), "3.9 kb", "Should be '3.9 kb'");
test.equal(filesize(this.kb, 1, false), "500 B", "Should be '500 B'");
test.equal(filesize(this.kb, true), "3.9K", "Should be '3.9K'");
test.equal(filesize(this.kb, true, false), "500", "Should be '500'");

test.equal(filesize(this.num), "1.00 KB", "Should be '1.00 KB'");
test.equal(filesize(this.num, 1), "1.0 KB", "Should be '1.0 KB'");
test.equal(filesize(this.num, 1, false), "1.0 KB", "Should be '1.0 KB'");
test.equal(filesize(this.num), "1.00 kB", "Should be '1.00 kB'");
test.equal(filesize(this.num, 1), "1.0 kB", "Should be '1.0 kB'");
test.equal(filesize(this.num, 1, false), "1.0 kB", "Should be '1.0 kB'");
test.equal(filesize(this.num, true), "1K", "Should be '1K'");
test.equal(filesize(this.num, true, false), "1K", "Should be '1K'");

test.equal(filesize(this.str), "1.00 KB", "Should be '1.00 KB'");
test.equal(filesize(this.str, 1), "1.0 KB", "Should be '1.0 KB'");
test.equal(filesize(this.str, 1, false), "1.0 KB", "Should be '1.0 KB'");
test.equal(filesize(this.str), "1.00 kB", "Should be '1.00 kB'");
test.equal(filesize(this.str, 1), "1.0 kB", "Should be '1.0 kB'");
test.equal(filesize(this.str, 1, false), "1.0 kB", "Should be '1.0 kB'");
test.equal(filesize(this.str, true), "1K", "Should be '1K'");
test.equal(filesize(this.str, true, false), "1K", "Should be '1K'");

test.equal(filesize(this.neg), "-1.00 KB", "Should be '-1.00 KB'");
test.equal(filesize(this.neg, 1), "-1.0 KB", "Should be '-1.0 KB'");
test.equal(filesize(this.neg, 1, false), "-1.0 KB", "Should be '-1.0 KB'");
test.equal(filesize(this.neg, true), "-1K", "Should be '-1KB'");
test.equal(filesize(this.neg, true, false), "-1K", "Should be '-1KB'");
test.equal(filesize(this.neg), "-1.00 kB", "Should be '-1.00 kB'");
test.equal(filesize(this.neg, 1), "-1.0 kB", "Should be '-1.0 kB'");
test.equal(filesize(this.neg, 1, false), "-1.0 kB", "Should be '-1.0 kB'");
test.equal(filesize(this.neg, true), "-1K", "Should be '-1K'");
test.equal(filesize(this.neg, true, false), "-1K", "Should be '-1K'");

test.equal(filesize(this.byte), "1 B", "Should be '1 B'");
test.equal(filesize(this.byte, 1), "1 B", "Should be '1 B'");
Expand Down

0 comments on commit 223b8ea

Please sign in to comment.