Skip to content

Commit 24a73bf

Browse files
petersendiditarschmitz
authored andcommitted
Spinner: use the _classes method.
Fixes #7053
1 parent 00c3fef commit 24a73bf

File tree

3 files changed

+40
-5
lines changed

3 files changed

+40
-5
lines changed

tests/unit/spinner/spinner_common.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
TestHelpers.commonWidgetTests( "spinner", {
22
defaults: {
3+
classes: {
4+
"ui-spinner-input": null,
5+
"ui-spinner": "ui-corner-all",
6+
"ui-spinner-button": null,
7+
"ui-spinner-up": "ui-corner-tr",
8+
"ui-spinner-down": "ui-corner-br"
9+
},
310
culture: null,
411
disabled: false,
512
icons: {

tests/unit/spinner/spinner_core.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@ var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
44

55
module( "spinner: core" );
66

7+
test( "markup structure", function() {
8+
expect( 9 );
9+
var element = $( "#spin" ).spinner(),
10+
spinner = element.spinner( "widget" ),
11+
up = spinner.find( ".ui-spinner-up" ),
12+
down = spinner.find( ".ui-spinner-down" );
13+
14+
ok( element.hasClass( "ui-spinner-input" ), "input is .ui-spinner-input" );
15+
16+
ok( spinner.hasClass( "ui-spinner" ), "main element is .ui-spinner" );
17+
ok( spinner.hasClass( "ui-widget" ), "main element is .ui-widget" );
18+
ok( spinner.hasClass( "ui-widget-content" ), "main element is .ui-widget-content" );
19+
ok( spinner.hasClass( "ui-corner-all" ), "main element is .ui-corner-all" );
20+
21+
ok( up.hasClass( "ui-spinner-button" ), "up button is .ui-spinner-button" );
22+
ok( up.hasClass( "ui-corner-tr" ), "up button is .ui-corner-tr" );
23+
24+
ok( down.hasClass( "ui-spinner-button" ), "down button is .ui-spinner-button" );
25+
ok( down.hasClass( "ui-corner-br" ), "down button is .ui-corner-br" );
26+
});
27+
728
test( "keydown UP on input, increases value not greater than max", function() {
829
expect( 5 );
930
var element = $( "#spin" ).val( 70 ).spinner({

ui/spinner.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ return $.widget( "ui.spinner", {
4141
defaultElement: "<input>",
4242
widgetEventPrefix: "spin",
4343
options: {
44+
classes: {
45+
"ui-spinner-input": null,
46+
"ui-spinner": "ui-corner-all",
47+
"ui-spinner-button": null,
48+
"ui-spinner-up": "ui-corner-tr",
49+
"ui-spinner-down": "ui-corner-br"
50+
},
4451
culture: null,
4552
icons: {
4653
down: "ui-icon-triangle-1-s",
@@ -203,7 +210,7 @@ return $.widget( "ui.spinner", {
203210

204211
_draw: function() {
205212
var uiSpinner = this.uiSpinner = this.element
206-
.addClass( "ui-spinner-input" )
213+
.addClass( this._classes( "ui-spinner-input" ) )
207214
.attr( "autocomplete", "off" )
208215
.wrap( this._uiSpinnerHtml() )
209216
.parent()
@@ -254,15 +261,15 @@ return $.widget( "ui.spinner", {
254261
},
255262

256263
_uiSpinnerHtml: function() {
257-
return "<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>";
264+
return "<span class='" + this._classes( "ui-spinner" ) + " ui-widget ui-widget-content'></span>";
258265
},
259266

260267
_buttonHtml: function() {
261268
return "" +
262-
"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'>" +
269+
"<a class='" + this._classes( "ui-spinner-button ui-spinner-up" ) + "'>" +
263270
"<span class='ui-icon " + this.options.icons.up + "'>&#9650;</span>" +
264271
"</a>" +
265-
"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>" +
272+
"<a class='" + this._classes( "ui-spinner-button ui-spinner-down" ) + "'>" +
266273
"<span class='ui-icon " + this.options.icons.down + "'>&#9660;</span>" +
267274
"</a>";
268275
},
@@ -461,7 +468,7 @@ return $.widget( "ui.spinner", {
461468

462469
_destroy: function() {
463470
this.element
464-
.removeClass( "ui-spinner-input" )
471+
.removeClass( this._classes( "ui-spinner-input" ) )
465472
.prop( "disabled", false )
466473
.removeAttr( "autocomplete" )
467474
.removeAttr( "role" )

0 commit comments

Comments
 (0)