From: Scott González Date: Fri, 20 May 2011 20:25:04 +0000 (-0400) Subject: Spinner: Changed casing of option numberformat -> numberFormat. X-Git-Tag: 1.9m6~111^2~44 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=af35f0bbc9064ec66bee19c730bf4cb9de2834db;p=jquery-ui.git Spinner: Changed casing of option numberformat -> numberFormat. --- diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html index 8288e4c3d..1e9b37d08 100644 --- a/demos/spinner/currency.html +++ b/demos/spinner/currency.html @@ -27,7 +27,7 @@ max: 2500, step: 25, start: 1000, - numberformat: "C" + numberFormat: "C" }); }); diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html index 0a38fc51f..cdc659298 100644 --- a/demos/spinner/decimal.html +++ b/demos/spinner/decimal.html @@ -18,7 +18,7 @@ $(function() { $("#spinner").spinner({ step: 0.01, - numberformat: "n" + numberFormat: "n" }); $("#culture").change(function() { diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js index f6081b1f3..c9a7d5f62 100644 --- a/tests/unit/spinner/spinner_defaults.js +++ b/tests/unit/spinner/spinner_defaults.js @@ -4,7 +4,7 @@ commonWidgetTests( "spinner", { incremental: true, max: null, min: null, - numberformat: null, + numberFormat: null, page: 10, step: null, value: null, diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js index 3db7e5c55..398780ad2 100644 --- a/tests/unit/spinner/spinner_options.js +++ b/tests/unit/spinner/spinner_options.js @@ -5,26 +5,26 @@ module("spinner: options"); -test("numberformat, number", function() { +test("numberFormat, number", function() { var el = $("#spin").spinner({ value: "1", - numberformat: "n" + numberFormat: "n" }); equal(el.val(), "1.00"); }); -test("numberformat, number, simple", function() { +test("numberFormat, number, simple", function() { var el = $("#spin").spinner({ value: "1", - numberformat: "n0" + numberFormat: "n0" }); equal(el.val(), "1"); }); -test("numberformat, currency", function() { +test("numberFormat, currency", function() { var el = $("#spin").spinner({ value: "1", - numberformat: "C" + numberFormat: "C" }); equal(el.val(), "$1.00"); }); @@ -111,7 +111,7 @@ test("step, 2", function() { test("step, 0.7", function() { var el = $("#spin").spinner({ step: 0.7, - numberformat: "n1" + numberFormat: "n1" }); equals(el.val(), "0.0", "value initialized to"); diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 2709175b5..0a0ebb37e 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -20,7 +20,7 @@ $.widget( "ui.spinner", { incremental: true, max: null, min: null, - numberformat: null, + numberFormat: null, page: 10, step: null, value: null @@ -318,13 +318,13 @@ $.widget( "ui.spinner", { _parse: function( val ) { if ( typeof val === "string" ) { - val = $.global && this.options.numberformat ? $.global.parseFloat( val ) : +val; + val = $.global && this.options.numberFormat ? $.global.parseFloat( val ) : +val; } return isNaN( val ) ? null : val; }, _format: function( num ) { - this.element.val( $.global && this.options.numberformat ? $.global.format( num, this.options.numberformat ) : num ); + this.element.val( $.global && this.options.numberFormat ? $.global.format( num, this.options.numberFormat ) : num ); }, destroy: function() {