diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-01-31 22:04:09 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-01-31 22:04:09 -0500 |
| commit | cb8f5b7f2679ab5473229cac432f28c72521048c (patch) | |
| tree | 60b63ec0b7f190832dcadef9e04a195985e61621 /ui/jquery.ui.spinner.js | |
| parent | bb857ddd8d6d4ac7620b49bf765352cd064494c0 (diff) | |
| parent | effbb2c0ec2e60bea6ec5e5822ee52f8ea9e18bc (diff) | |
| download | jquery-ui-cb8f5b7f2679ab5473229cac432f28c72521048c.tar.gz jquery-ui-cb8f5b7f2679ab5473229cac432f28c72521048c.zip | |
Merge branch 'master' into widget-events
Conflicts:
ui/jquery.ui.widget.js
Diffstat (limited to 'ui/jquery.ui.spinner.js')
| -rw-r--r-- | ui/jquery.ui.spinner.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index f444e3126..c8a76f4cf 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -14,6 +14,7 @@ (function($) { $.widget('ui.spinner', { + defaultElement: "<input>", options: { incremental: true, max: null, @@ -305,20 +306,14 @@ $.widget('ui.spinner', { _parse: function(val) { var input = val; if (typeof val == 'string') { - // special case for currency formatting until Globalization handles currencies - if (this.options.numberformat == "C" && window.Globalization) { - // parseFloat should accept number format, including currency - var culture = Globalization.culture || Globalization.cultures['default']; - val = val.replace(culture.numberFormat.currency.symbol, ""); - } - val = window.Globalization && this.options.numberformat ? Globalization.parseFloat(val) : +val; + val = $.global && this.options.numberformat ? $.global.parseFloat(val) : +val; } return isNaN(val) ? null : val; }, _format: function(num) { var num = this.options.value; - this.element.val( window.Globalization && this.options.numberformat ? Globalization.format(num, this.options.numberformat) : num ); + this.element.val( $.global && this.options.numberformat ? $.global.format(num, this.options.numberformat) : num ); }, destroy: function() { |