Skip to content

Commit 92fe5e9

Browse files
committed
Fixed #5362 - Buttonset class should be ui-buttonset because buttonset is one word
1 parent 2a8271c commit 92fe5e9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

tests/static/button/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ <h2>Using label elements (used when proxying to radio or check inputs)</h2>
110110

111111
<h2>Button Sets</h2>
112112

113-
<div class="ui-button-set">
113+
<div class="ui-buttonset">
114114
<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-left"><span class="ui-button-text">Simple button</span></button>
115115
<button class="ui-button ui-button-text-only ui-widget ui-state-default"><span class="ui-button-text">Simple button</span></button>
116116
<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-right"><span class="ui-button-text">Simple button</span></button>

tests/unit/button/button_core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ test("input type submit, don't create child elements", function() {
5959

6060
test("buttonset", function() {
6161
var set = $("#radio1").buttonset();
62-
ok( set.is(".ui-button-set") );
62+
ok( set.is(".ui-buttonset") );
6363
same( set.children(".ui-button").length, 3 );
6464
same( set.children("input:radio.ui-helper-hidden-accessible").length, 3 );
6565
ok( set.children("label:eq(0)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );

themes/base/jquery.ui.button.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ input.ui-button { padding: .4em 1em; }
2323
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
2424

2525
/*button sets*/
26-
.ui-button-set { margin-right: 7px; }
27-
.ui-button-set .ui-button { margin-left: 0; margin-right: -.3em; }
26+
.ui-buttonset { margin-right: 7px; }
27+
.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
2828

2929
/* workarounds */
3030
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */

ui/jquery.ui.button.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ $.widget( "ui.button", {
311311

312312
$.widget( "ui.buttonset", {
313313
_create: function() {
314-
this.element.addClass( "ui-button-set" );
314+
this.element.addClass( "ui-buttonset" );
315315
this._init();
316316
},
317317

@@ -349,7 +349,7 @@ $.widget( "ui.buttonset", {
349349
},
350350

351351
destroy: function() {
352-
this.element.removeClass( "ui-button-set" );
352+
this.element.removeClass( "ui-buttonset" );
353353
this.buttons
354354
.map(function() {
355355
return $( this ).button( "widget" )[ 0 ];

0 commit comments

Comments
 (0)