Spinner: Fix value option initalization

diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index 954e82ea5c2f530b38678ce76f4f7a33f7183ea7..a9902a2510bb2f667aa4ea014b59123d81927df5 100644 (file)
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -34,6 +34,7 @@
 \r
 <div id="qunit-fixture">\r
        <input id="spin">\r
+       <input id="spin2" value="2">\r
 </div>\r
 \r
 </body>\r

diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js
index a85891970ab762b18275d5ab70fbf8ccaf71154f..aa88fd649e21fbab3223089fd6fe4adb1440f5cf 100644 (file)
--- a/tests/unit/spinner/spinner_defaults.js
+++ b/tests/unit/spinner/spinner_defaults.js
@@ -12,7 +12,7 @@ var spinner_defaults = {
        numberformat: "n",\r
        page: 5,\r
        step: null,\r
-       value: 0\r
+       value: null\r
 };\r
 \r
 commonWidgetTests('spinner', { defaults: spinner_defaults });\r

diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index 4e280ef6aa4d5071b4121135c6fa96350287abb8..48fea3203eaee63c4015112740e5d43303764bbd 100644 (file)
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -157,15 +157,30 @@ test("step", function() {
 \r
 });\r
 \r
-test("value", function() {\r
-       expect(2);\r
-       \r
-       el = $('#spin').spinner({ value: 100 });\r
-       \r
+test("value, default, specified in markup", function() {\r
+       var el = $('#spin2').spinner();\r
+       equals(el.val(), 2, "starting value");\r
+});\r
+\r
+test("value, default, nothing specified", function() {\r
+       var el = $('#spin').spinner();\r
+       equals(el.val(), 0, "starting value");\r
+});\r
+\r
+test("value, override", function() {\r
+       var el = $('#spin').spinner({ value: 100 });\r
        equals(el.val(), 100, "starting value");\r
-       \r
+});\r
+\r
+test("value, override markup", function() {\r
+       var el = $('#spin2').spinner({ value: 100 });\r
+       equals(el.val(), 100, "starting value");\r
+});\r
+\r
+test("value, override later", function() {\r
+       var el = $('#spin').spinner();\r
+       equals(el.val(), 0, "starting value");\r
        el.spinner('option', 'value', 1000);\r
-       \r
        equals(el.val(), 1000, "value option changed and set as current value");\r
 });\r
 \r

diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index a9238a738b2020a6f41c23d91106e8ac9152a9c9..70dd7adac8f6e769cef43d439a07b0fc758335b4 100644 (file)
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -29,11 +29,11 @@ $.widget('ui.spinner', {
                numberformat: "n",\r
                page: 5,\r
                step: null,\r
-               value: 0\r
+               value: null\r
        },\r
        \r
        _create: function() {           \r
-               this.value(this.element.val() || this.options.value);\r
+               this.value(this.options.value !== null ? this.options.value : this.element.val());\r
                this._draw();\r
                this._mousewheel();\r
                this._aria();\r