mirror of
https://github.com/jquery/jquery-ui.git
synced 2025-01-07 20:34:24 +00:00
Fixed #5362 - Buttonset class should be ui-buttonset because buttonset is one word
This commit is contained in:
parent
2a8271c701
commit
92fe5e9225
@ -110,7 +110,7 @@
|
|||||||
|
|
||||||
<h2>Button Sets</h2>
|
<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 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"><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>
|
<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>
|
||||||
|
@ -59,7 +59,7 @@ test("input type submit, don't create child elements", function() {
|
|||||||
|
|
||||||
test("buttonset", function() {
|
test("buttonset", function() {
|
||||||
var set = $("#radio1").buttonset();
|
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(".ui-button").length, 3 );
|
||||||
same( set.children("input:radio.ui-helper-hidden-accessible").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)") );
|
ok( set.children("label:eq(0)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
|
||||||
|
4
themes/base/jquery.ui.button.css
vendored
4
themes/base/jquery.ui.button.css
vendored
@ -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; }
|
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
|
||||||
|
|
||||||
/*button sets*/
|
/*button sets*/
|
||||||
.ui-button-set { margin-right: 7px; }
|
.ui-buttonset { margin-right: 7px; }
|
||||||
.ui-button-set .ui-button { margin-left: 0; margin-right: -.3em; }
|
.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
|
||||||
|
|
||||||
/* workarounds */
|
/* workarounds */
|
||||||
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
|
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
|
||||||
|
4
ui/jquery.ui.button.js
vendored
4
ui/jquery.ui.button.js
vendored
@ -311,7 +311,7 @@ $.widget( "ui.button", {
|
|||||||
|
|
||||||
$.widget( "ui.buttonset", {
|
$.widget( "ui.buttonset", {
|
||||||
_create: function() {
|
_create: function() {
|
||||||
this.element.addClass( "ui-button-set" );
|
this.element.addClass( "ui-buttonset" );
|
||||||
this._init();
|
this._init();
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -349,7 +349,7 @@ $.widget( "ui.buttonset", {
|
|||||||
},
|
},
|
||||||
|
|
||||||
destroy: function() {
|
destroy: function() {
|
||||||
this.element.removeClass( "ui-button-set" );
|
this.element.removeClass( "ui-buttonset" );
|
||||||
this.buttons
|
this.buttons
|
||||||
.map(function() {
|
.map(function() {
|
||||||
return $( this ).button( "widget" )[ 0 ];
|
return $( this ).button( "widget" )[ 0 ];
|
||||||
|
Loading…
Reference in New Issue
Block a user