Skip to content
Browse files

Fixed #5362 - Buttonset class should be ui-buttonset because buttonse…

…t is one word

git-svn-id: http://jquery-ui.googlecode.com/svn/trunk@3935 a1defee3-d24d-0410-b1e3-3171fe540af7
  • Loading branch information...
1 parent d59b6df commit 3fa6d14e56cb94d2ad20836307d2f33b96df4855 rdworth committed Mar 17, 2010
View
2 tests/static/button/default.html
@@ -110,7 +110,7 @@
<h2>Button Sets</h2>
- <div class="ui-button-set">
+ <div class="ui-buttonset">
<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>
<button class="ui-button ui-button-text-only ui-widget ui-state-default"><span class="ui-button-text">Simple button</span></button>
<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>
View
2 tests/unit/button/button_core.js
@@ -59,7 +59,7 @@ test("input type submit, don't create child elements", function() {
test("buttonset", function() {
var set = $("#radio1").buttonset();
- ok( set.is(".ui-button-set") );
+ ok( set.is(".ui-buttonset") );
same( set.children(".ui-button").length, 3 );
same( set.children("input:radio.ui-helper-hidden-accessible").length, 3 );
ok( set.children("label:eq(0)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
View
4 themes/base/jquery.ui.button.css
@@ -23,8 +23,8 @@ input.ui-button { padding: .4em 1em; }
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
/*button sets*/
-.ui-button-set { margin-right: 7px; }
-.ui-button-set .ui-button { margin-left: 0; margin-right: -.3em; }
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
View
4 ui/jquery.ui.button.js
@@ -311,7 +311,7 @@ $.widget( "ui.button", {
$.widget( "ui.buttonset", {
_create: function() {
- this.element.addClass( "ui-button-set" );
+ this.element.addClass( "ui-buttonset" );
this._init();
},
@@ -349,7 +349,7 @@ $.widget( "ui.buttonset", {
},
destroy: function() {
- this.element.removeClass( "ui-button-set" );
+ this.element.removeClass( "ui-buttonset" );
this.buttons
.map(function() {
return $( this ).button( "widget" )[ 0 ];

0 comments on commit 3fa6d14

Please sign in to comment.
Something went wrong with that request. Please try again.