diff options
author | Andrew Dolgov <[email protected]> | 2011-11-08 20:40:44 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-11-08 20:40:44 +0400 |
commit | 81bea17aefb26859f825b9293c7c99192874806e (patch) | |
tree | fb244408ca271affa2899adb634788802c9a89d8 /lib/dojo/currency.js | |
parent | 870a70e109ac9e80a88047044530de53d0404ec7 (diff) |
upgrade Dojo to 1.6.1
Diffstat (limited to 'lib/dojo/currency.js')
-rw-r--r-- | lib/dojo/currency.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/dojo/currency.js b/lib/dojo/currency.js index 53833344d..8ae564618 100644 --- a/lib/dojo/currency.js +++ b/lib/dojo/currency.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ @@ -8,12 +8,13 @@ if(!dojo._hasResource["dojo.currency"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo.currency"] = true; dojo.provide("dojo.currency"); - dojo.require("dojo.number"); dojo.require("dojo.i18n"); -dojo.requireLocalization("dojo.cldr", "currency", null, "ROOT,ar,ca,cs,da,de,el,en,en-au,en-ca,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,ru,sk,sl,sv,th,tr,zh,zh-tw"); +dojo.requireLocalization("dojo.cldr", "currency", null, "ROOT,ar,ca,cs,da,de,el,en,en-au,en-ca,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,ro,ru,sk,sl,sv,th,tr,zh,zh-hant,zh-hk,zh-tw"); dojo.require("dojo.cldr.monetary"); +dojo.getObject("currency", true, dojo); + /*===== dojo.currency = { // summary: localized formatting and parsing routines for currencies @@ -47,7 +48,7 @@ dojo.currency._mixInDefaults = function(options){ // Mixin with provided options return dojo.mixin(data, options); -} +}; /*===== dojo.declare("dojo.currency.__FormatOptions", [dojo.number.__FormatOptions], { @@ -82,7 +83,7 @@ dojo.currency.format = function(/*Number*/value, /*dojo.currency.__FormatOptions // the number to be formatted. return dojo.number.format(value, dojo.currency._mixInDefaults(options)); -} +}; dojo.currency.regexp = function(/*dojo.number.__RegexpOptions?*/options){ // @@ -93,7 +94,7 @@ dojo.currency.regexp = function(/*dojo.number.__RegexpOptions?*/options){ // Returns regular expression with positive and negative match, group and decimal separators // Note: the options.places default, the number of decimal places to accept, is defined by the currency type. return dojo.number.regexp(dojo.currency._mixInDefaults(options)); // String -} +}; /*===== dojo.declare("dojo.currency.__ParseOptions", [dojo.number.__ParseOptions], { @@ -134,6 +135,6 @@ dojo.currency.parse = function(/*String*/expression, /*dojo.currency.__ParseOpti // expression: A string representation of a currency value return dojo.number.parse(expression, dojo.currency._mixInDefaults(options)); -} +}; } |