diff options
| author | Felix Nagel <info@felixnagel.com> | 2011-10-09 00:14:03 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2011-10-09 00:14:03 +0200 |
| commit | ac54556fb3b7ab08744cc7ea663a276d5c91cdd4 (patch) | |
| tree | 22fddadf4753d0e2bce4fc9528b9e1cc7cb342d8 /ui/jquery.ui.spinner.js | |
| parent | d7e23ce225b6fe08cfa779df0f7e70e4d95a0883 (diff) | |
| parent | 647bab506e288658c8a28dab1083c657ad61951e (diff) | |
| download | jquery-ui-ac54556fb3b7ab08744cc7ea663a276d5c91cdd4.tar.gz jquery-ui-ac54556fb3b7ab08744cc7ea663a276d5c91cdd4.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui into selectmenu
Diffstat (limited to 'ui/jquery.ui.spinner.js')
| -rw-r--r-- | ui/jquery.ui.spinner.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 09df97be7..31de2c9da 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -30,6 +30,7 @@ $.widget( "ui.spinner", { defaultElement: "<input>", widgetEventPrefix: "spin", options: { + culture: null, incremental: true, max: null, min: null, @@ -320,7 +321,8 @@ $.widget( "ui.spinner", { _parse: function( val ) { if ( typeof val === "string" && val !== "" ) { - val = window.Globalize && this.options.numberFormat ? Globalize.parseFloat( val ) : +val; + val = window.Globalize && this.options.numberFormat ? + Globalize.parseFloat( val, 10, this.options.culture ) : +val; } return val === "" || isNaN( val ) ? null : val; }, @@ -330,7 +332,7 @@ $.widget( "ui.spinner", { return ""; } return window.Globalize && this.options.numberFormat ? - Globalize.format( value, this.options.numberFormat ) : + Globalize.format( value, this.options.numberFormat, this.options.culture ) : value; }, |