author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:08:23 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:08:23 (UTC) |
commit | 928f3f3ed3981f7f81b69ed94f2a315205db39fa (patch) (side-by-side diff) | |
tree | 8a47229b56e4c906de8512baf0c5ca100bc03dfb /frontend/gamma/js/MochiKit/Format.js | |
parent | bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7 (diff) | |
download | clipperz-928f3f3ed3981f7f81b69ed94f2a315205db39fa.zip clipperz-928f3f3ed3981f7f81b69ed94f2a315205db39fa.tar.gz clipperz-928f3f3ed3981f7f81b69ed94f2a315205db39fa.tar.bz2 |
Fixed frontend properties and updated MochiKit version
Diffstat (limited to 'frontend/gamma/js/MochiKit/Format.js') (more/less context) (show whitespace changes)
-rw-r--r-- | frontend/gamma/js/MochiKit/Format.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/frontend/gamma/js/MochiKit/Format.js b/frontend/gamma/js/MochiKit/Format.js index 122845e..58877e7 100644 --- a/frontend/gamma/js/MochiKit/Format.js +++ b/frontend/gamma/js/MochiKit/Format.js @@ -1,35 +1,35 @@ /*** MochiKit.Format 1.5 See <http://mochikit.com/> for documentation, downloads, license, etc. (c) 2005 Bob Ippolito. All rights Reserved. ***/ -MochiKit.Base._module('Format', '1.5', ['Base']); +MochiKit.Base.module(MochiKit, 'Format', '1.5', ['Base']); MochiKit.Format._numberFormatter = function (placeholder, header, footer, locale, isPercent, precision, leadingZeros, separatorAt, trailingZeros) { return function (num) { num = parseFloat(num); if (typeof(num) == "undefined" || num === null || isNaN(num)) { return placeholder; } var curheader = header; var curfooter = footer; if (num < 0) { num = -num; } else { curheader = curheader.replace(/-/, ""); } var me = arguments.callee; var fmt = MochiKit.Format.formatLocale(locale); if (isPercent) { num = num * 100.0; curfooter = fmt.percent + curfooter; } num = MochiKit.Format.roundToFixed(num, precision); var parts = num.split(/\./); var whole = parts[0]; var frac = (parts.length == 1) ? "" : parts[1]; @@ -83,87 +83,87 @@ MochiKit.Format.numberFormatter = function (pattern, placeholder/* = "" */, loca var separatorAt; if (typeof(locale) == "undefined") { locale = "default"; } if (tmp.length == 1) { separatorAt = null; } else { separatorAt = tmp[1].length; } var leadingZeros = whole.length - whole.replace(/0/g, "").length; var trailingZeros = frac.length - frac.replace(/0/g, "").length; var precision = frac.length; var rval = MochiKit.Format._numberFormatter( placeholder, header, footer, locale, isPercent, precision, leadingZeros, separatorAt, trailingZeros ); var m = MochiKit.Base; if (m) { var fn = arguments.callee; var args = m.concat(arguments); rval.repr = function () { return [ self.NAME, "(", - map(m.repr, args).join(", "), + m.map(m.repr, args).join(", "), ")" ].join(""); }; } return rval; }; /** @id MochiKit.Format.formatLocale */ MochiKit.Format.formatLocale = function (locale) { if (typeof(locale) == "undefined" || locale === null) { locale = "default"; } if (typeof(locale) == "string") { var rval = MochiKit.Format.LOCALE[locale]; if (typeof(rval) == "string") { rval = arguments.callee(rval); MochiKit.Format.LOCALE[locale] = rval; } return rval; } else { return locale; } }; /** @id MochiKit.Format.twoDigitAverage */ MochiKit.Format.twoDigitAverage = function (numerator, denominator) { if (denominator) { var res = numerator / denominator; if (!isNaN(res)) { return MochiKit.Format.twoDigitFloat(res); } } return "0"; }; /** @id MochiKit.Format.twoDigitFloat */ MochiKit.Format.twoDigitFloat = function (aNumber) { - var res = roundToFixed(aNumber, 2); + var res = MochiKit.Format.roundToFixed(aNumber, 2); if (res.indexOf(".00") > 0) { return res.substring(0, res.length - 3); } else if (res.charAt(res.length - 1) == "0") { return res.substring(0, res.length - 1); } else { return res; } }; /** @id MochiKit.Format.lstrip */ MochiKit.Format.lstrip = function (str, /* optional */chars) { str = str + ""; if (typeof(str) != "string") { return null; } if (!chars) { return str.replace(/^\s+/, ""); } else { return str.replace(new RegExp("^[" + chars + "]+"), ""); } }; /** @id MochiKit.Format.rstrip */ MochiKit.Format.rstrip = function (str, /* optional */chars) { @@ -172,131 +172,131 @@ MochiKit.Format.rstrip = function (str, /* optional */chars) { return null; } if (!chars) { return str.replace(/\s+$/, ""); } else { return str.replace(new RegExp("[" + chars + "]+$"), ""); } }; /** @id MochiKit.Format.strip */ MochiKit.Format.strip = function (str, /* optional */chars) { var self = MochiKit.Format; return self.rstrip(self.lstrip(str, chars), chars); }; /** @id MochiKit.Format.truncToFixed */ MochiKit.Format.truncToFixed = function (aNumber, precision) { var fixed = MochiKit.Format._numberToFixed(aNumber, precision); var fracPos = fixed.indexOf("."); if (fracPos > 0 && fracPos + precision + 1 < fixed.length) { fixed = fixed.substring(0, fracPos + precision + 1); fixed = MochiKit.Format._shiftNumber(fixed, 0); } return fixed; -} +}; /** @id MochiKit.Format.roundToFixed */ MochiKit.Format.roundToFixed = function (aNumber, precision) { var fixed = MochiKit.Format._numberToFixed(aNumber, precision); var fracPos = fixed.indexOf("."); if (fracPos > 0 && fracPos + precision + 1 < fixed.length) { var str = MochiKit.Format._shiftNumber(fixed, precision); str = MochiKit.Format._numberToFixed(Math.round(parseFloat(str)), 0); fixed = MochiKit.Format._shiftNumber(str, -precision); } return fixed; -} +}; /** * Converts a number to a fixed format string. This function handles * conversion of exponents by shifting the decimal point to the left * or the right. It also guarantees a specified minimum number of * fractional digits (but no maximum). * * @param {Number} aNumber the number to convert * @param {Number} precision the minimum number of decimal digits * * @return {String} the fixed format number string */ MochiKit.Format._numberToFixed = function (aNumber, precision) { var str = aNumber.toString(); var parts = str.split(/[eE]/); - var exp = (parts.length === 1) ? 0 : parseInt(parts[1]) || 0; + var exp = (parts.length === 1) ? 0 : parseInt(parts[1], 10) || 0; var fixed = MochiKit.Format._shiftNumber(parts[0], exp); parts = fixed.split(/\./); var whole = parts[0]; var frac = (parts.length === 1) ? "" : parts[1]; while (frac.length < precision) { frac += "0"; } if (frac.length > 0) { return whole + "." + frac; } else { return whole; } -} +}; /** * Shifts the decimal dot location in a fixed format number string. * This function handles negative values and will add and remove * leading and trailing zeros as needed. * * @param {String} num the fixed format number string * @param {Number} exp the base-10 exponent to apply * * @return {String} the new fixed format number string */ MochiKit.Format._shiftNumber = function (num, exp) { var pos = num.indexOf("."); if (pos < 0) { pos = num.length; } else { num = num.substring(0, pos) + num.substring(pos + 1); } pos += exp; while (pos <= 0 || (pos <= 1 && num.charAt(0) === "-")) { if (num.charAt(0) === "-") { num = "-0" + num.substring(1); } else { num = "0" + num; } pos++; } while (pos > num.length) { num += "0"; } if (pos < num.length) { num = num.substring(0, pos) + "." + num.substring(pos); } while (/^0[^.]/.test(num)) { num = num.substring(1); } while (/^-0[^.]/.test(num)) { num = "-" + num.substring(2); } return num; -} +}; /** @id MochiKit.Format.percentFormat */ MochiKit.Format.percentFormat = function (aNumber) { return MochiKit.Format.twoDigitFloat(100 * aNumber) + '%'; }; MochiKit.Format.LOCALE = { en_US: {separator: ",", decimal: ".", percent: "%"}, de_DE: {separator: ".", decimal: ",", percent: "%"}, pt_BR: {separator: ".", decimal: ",", percent: "%"}, fr_FR: {separator: " ", decimal: ",", percent: "%"}, "default": "en_US", __export__: false }; MochiKit.Format.__new__ = function () { MochiKit.Base.nameFunctions(this); var base = this.NAME + "."; var k, v, o; for (k in this.LOCALE) { o = this.LOCALE[k]; if (typeof(o) == "object") { o.repr = function () { return this.NAME; }; o.NAME = base + "LOCALE." + k; |