Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Size options can be overriden #48

Closed
wants to merge 1 commit into from
Closed

Size options can be overriden #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/filesize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* filesize
*
* @author Jason Mulligan <[email protected]>
* @copyright 2013 Jason Mulligan
* @copyright 2014 Jason Mulligan
* @license BSD-3 <https://raw.github.com/avoidwork/filesize.js/master/LICENSE>
* @link http://filesizejs.com
* @module filesize
Expand All @@ -23,9 +23,10 @@ var bit = /b$/,
* @method filesize
* @param {Mixed} arg String, Int or Float to transform
* @param {Object} descriptor [Optional] Flags
* @param {Object} options [Optional] Overrides default size options
* @return {String} Readable file size String
*/
function filesize ( arg, descriptor ) {
function filesize ( arg, descriptor, options ) {
var result = "",
skip = false,
i = 6,
Expand All @@ -49,6 +50,8 @@ function filesize ( arg, descriptor ) {
num = -num;
}

options = options || defaultOptions;

// Zero is now a special case because bytes divide by 1
if ( num === 0 ) {
if ( unix ) {
Expand Down Expand Up @@ -114,7 +117,7 @@ function filesize ( arg, descriptor ) {
*
* @type {Object}
*/
var options = {
var defaultOptions = {
2 : {
bits : [["B", 1], ["kb", 128], ["Mb", 131072], ["Gb", 134217728], ["Tb", 137438953472], ["Pb", 140737488355328]],
bytes : [["B", 1], ["kB", 1024], ["MB", 1048576], ["GB", 1073741824], ["TB", 1099511627776], ["PB", 1125899906842624]]
Expand Down
4 changes: 2 additions & 2 deletions lib/filesize.map
View file
Open in desktop
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":"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",
"mappings":"A;;;;;;;AAUE,SAAS,CAAEA,CAAF,CAAW,CAkBtBC,QAASA,EAAS,CAAEC,CAAF,CAAOC,CAAP,CAAmBC,CAAnB,CAA6B,CAAA,IAC1CC,EAAS,EADiC,CAE1CC,EAAS,CAAA,CAFiC,CAG1CC,EAAS,CAHiC,CAI1CC,CAJ0C,CAIpCC,CAJoC,CAIzBC,CAJyB,CAIpBC,CAJoB,CAIPC,CAJO,CAIAC,CAE9C,IAAKC,KAAA,CAAOZ,CAAP,CAAL,CACC,KAAUa,MAAJ,CAAW,mBAAX,CAAN,CAGDZ,CAAA,CAAaA,CAAb,EAA2B,EAC3BM,EAAA,CAAmC,CAAA,CAAnC,GAAeN,CAAAM,KACfI,EAAA,CAAmC,CAAA,CAAnC,GAAeV,CAAAU,KACfL,EAAA,CAAmCQ,IAAAA,EAAtB,GAAAb,CAAAK,KAAA,CAAkCL,CAAAK,KAAlC,CAAsDK,CAAA,CAAO,CAAP,CAAY,EAC/EF,EAAA,CAAmCK,IAAAA,EAAtB,GAAAb,CAAAQ,MAAA,CAAkCR,CAAAQ,MAAlC,CAAsDE,CAAA,CAAO,CAAP,CAAY,CAC/EI,EAAA,CAAmCD,IAAAA,EAAtB,GAAAb,CAAAc,OAAA,CAAkCd,CAAAc,OAAlC,CAAsDJ,CAAA,CAAO,EAAP,CAAY,GAC/EH,EAAA,CAAaQ,MAAA,CAAQhB,CAAR,CAIb,EAHAiB,CAGA,CAHqB,CAGrB,CAHeT,CAGf,IACCA,CADD,CACO,CAACA,CADR,CAICN,EAAA,CAAUA,CAAV,EAAqBgB,CAGtB,IAAa,CAAb,GAAKV,CAAL,CAEEL,CAAA,CADIQ,CAAL,CACU,GADV,CAIU,GAJV,CAIgBI,CAJhB,CAIyB,GAL1B,KAWC,KAFAL,CAEA,CAFQR,CAAA,CAAQI,CAAR,CAAA,CAAcC,CAAA,CAAO,MAAP,CAAgB,OAA9B,CAER,CAAQF,CAAA,EAAR,CAAA,CAIC,GAHAc,CAGK,CAHIT,CAAA,CAAML,CAAN,CAAA,CAAS,CAAT,CAGJ,CAFLe,CAEK,CAFIV,CAAA,CAAML,CAAN,CAAA,CAAS,CAAT,CAEJ,CAAAG,CAAA,EAAOW,CAAZ,CAAmB,CAEbE,CAAAC,KAAA,CAAWF,CAAX,CAAL,GACChB,CACA,CADQ,CAAA,CACR,CAAAK,CAAA,CAAQ,CAFT,CAKAN,EAAA,CAAWoB,CAAAf,CAAAe,CAAMJ,CAANI,SAAA,CAAsBd,CAAtB,CAEN,EAACL,CAAN,EAAcO,CAAd,EACMJ,CAeL,EAfaiB,CAAAF,KAAA,CAAUF,CAAV,CAeb,GAdCA,CAcD,CAdUA,CAAAK,YAAA,EAcV,EAXAL,CAWA,CAXSA,CAAAM,OAAA,CAAe,CAAf,CAWT,CAVAC,CAUA,CAVSC,CAAAC,KAAA,CAAY1B,CAAZ,CAUT,CARK,CAACI,CAQN,EARyB,GAQzB,GARca,CAQd,GAPCA,CAOD,CAPU,GAOV;AAJW,IAIX,GAJKO,CAIL,GAJ4Bb,IAAAA,EAI5B,GAJmBa,CAAA,CAAE,CAAF,CAInB,EAJyCG,CAAAR,KAAA,CAAWK,CAAA,CAAE,CAAF,CAAX,CAIzC,IAHCxB,CAGD,CAHU4B,QAAA,CAAU5B,CAAV,CAAkB6B,CAAlB,CAGV,EAAA7B,CAAA,EAAUY,CAAV,CAAmBK,CAhBpB,EAkBWT,CAlBX,GAmBCR,CAnBD,EAmBWY,CAnBX,CAmBoBK,CAnBpB,CAsBA,MA/BkB,CAqChBH,CAAL,GACCd,CADD,CACU,GADV,CACgBA,CADhB,CAIA,OAAOA,EAnFuC,CAlBzB,IAGlBqB,EAAQ,IAHU,CAIlBH,EAAQ,KAJU,CAKlBW,EAAQ,EALU,CAMlBJ,EAAQ,QANU,CAOlBE,EAAQ,KAPU,CA6GlBZ,EAAiB,GAChB,MACK,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,MAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,SAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,YAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,cAAP,CAArF,CADL,OAEK,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,IAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,OAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,UAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,aAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,eAAP,CAArF,CAFL,CADgB,IAKf,MACI,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,KAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,KAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,KAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,MAAP,CAArF,CADJ,OAEI,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,GAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,GAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,IAAP,CAA9D;AAAqF,CAAC,IAAD,CAAO,IAAP,CAArF,CAFJ,CALe,CAYG,YAAxB,GAAK,MAAOe,QAAZ,CACCC,MAAAD,QADD,CACkBlC,CADlB,CAG4B,UAAvB,GAAK,MAAOoC,OAAZ,CACJA,MAAA,CAAQ,QAAS,EAAG,CACnB,MAAOpC,EADY,CAApB,CADI,CAMJD,CAAAC,SANI,CAMcA,CAlIG,CAApB,CAAA,CAqIG,IArIH;",
"sources":["filesize.js"],
"names":["global","filesize","arg","descriptor","result","skip","i","base","bits","neg","num","round","size","sizes","unix","spacer","isNaN","Error","undefined","Number","options","suffix","bite","test","toFixed","bit","toLowerCase","charAt","z","right","exec","zero","parseInt","radix","exports","module","define"]
"names":["global","filesize","arg","descriptor","options","result","skip","i","base","bits","num","round","sizes","unix","isNaN","Error","undefined","spacer","Number","neg","defaultOptions","size","suffix","bite","test","toFixed","bit","toLowerCase","charAt","z","right","exec","zero","parseInt","radix","exports","module","define"]
}
8 changes: 4 additions & 4 deletions lib/filesize.min.js
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion src/filesize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
* @method filesize
* @param {Mixed} arg String, Int or Float to transform
* @param {Object} descriptor [Optional] Flags
* @param {Object} options [Optional] Overrides default size options
* @return {String} Readable file size String
*/
function filesize ( arg, descriptor ) {
function filesize ( arg, descriptor, options ) {
var result = "",
skip = false,
i = 6,
Expand All @@ -30,6 +31,8 @@ function filesize ( arg, descriptor ) {
num = -num;
}

options = options || defaultOptions;

// Zero is now a special case because bytes divide by 1
if ( num === 0 ) {
if ( unix ) {
Expand Down
2 changes: 1 addition & 1 deletion src/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @type {Object}
*/
var options = {
var defaultOptions = {
2 : {
bits : [["B", 1], ["kb", 128], ["Mb", 131072], ["Gb", 134217728], ["Tb", 137438953472], ["Pb", 140737488355328]],
bytes : [["B", 1], ["kB", 1024], ["MB", 1048576], ["GB", 1073741824], ["TB", 1099511627776], ["PB", 1125899906842624]]
Expand Down