Skip to content

Commit 299d5c8

Browse files
committed
Spinner: Fix value option initalization
1 parent 1be2a79 commit 299d5c8

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

tests/unit/spinner/spinner.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ <h2 id="qunit-userAgent"></h2>
3434

3535
<div id="qunit-fixture">
3636
<input id="spin">
37+
<input id="spin2" value="2">
3738
</div>
3839

3940
</body>

tests/unit/spinner/spinner_defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var spinner_defaults = {
1212
numberformat: "n",
1313
page: 5,
1414
step: null,
15-
value: 0
15+
value: null
1616
};
1717

1818
commonWidgetTests('spinner', { defaults: spinner_defaults });

tests/unit/spinner/spinner_options.js

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,30 @@ test("step", function() {
157157

158158
});
159159

160-
test("value", function() {
161-
expect(2);
162-
163-
el = $('#spin').spinner({ value: 100 });
164-
160+
test("value, default, specified in markup", function() {
161+
var el = $('#spin2').spinner();
162+
equals(el.val(), 2, "starting value");
163+
});
164+
165+
test("value, default, nothing specified", function() {
166+
var el = $('#spin').spinner();
167+
equals(el.val(), 0, "starting value");
168+
});
169+
170+
test("value, override", function() {
171+
var el = $('#spin').spinner({ value: 100 });
165172
equals(el.val(), 100, "starting value");
166-
173+
});
174+
175+
test("value, override markup", function() {
176+
var el = $('#spin2').spinner({ value: 100 });
177+
equals(el.val(), 100, "starting value");
178+
});
179+
180+
test("value, override later", function() {
181+
var el = $('#spin').spinner();
182+
equals(el.val(), 0, "starting value");
167183
el.spinner('option', 'value', 1000);
168-
169184
equals(el.val(), 1000, "value option changed and set as current value");
170185
});
171186

ui/jquery.ui.spinner.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ $.widget('ui.spinner', {
2929
numberformat: "n",
3030
page: 5,
3131
step: null,
32-
value: 0
32+
value: null
3333
},
3434

3535
_create: function() {
36-
this.value(this.element.val() || this.options.value);
36+
this.value(this.options.value !== null ? this.options.value : this.element.val());
3737
this._draw();
3838
this._mousewheel();
3939
this._aria();

0 commit comments

Comments
 (0)