Skip to content

Commit 567d418

Browse files
committed
Controlgroup: finish adding classes option
1 parent ee1e190 commit 567d418

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

tests/unit/controlgroup/controlgroup_common.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ TestHelpers.commonWidgetTests( "controlgroup", {
88
},
99
direction: "horizontal",
1010
excludeInvisible: true,
11+
classes: {
12+
"ui-controlgroup": null,
13+
"ui-controlgroup-horizontal": null,
14+
"ui-controlgroup-vertical": null
15+
},
1116

1217
// Callbacks
1318
create: null

themes/base/controlgroup.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
.ui-controlgroup.ui-controlgroup-vertical > .ui-button {
1818
display: block;
1919
width: 100%;
20-
margin-top: 0em;
21-
margin-bottom: 0em;
20+
margin-top: 0;
21+
margin-bottom: 0;
2222
text-align: left;
2323
}
2424
.ui-controlgroup-vertical label.ui-button {

ui/controlgroup.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $.widget( "ui.controlgroup", {
4444
},
4545

4646
_create: function() {
47-
this._enhance();;
47+
this._enhance();
4848
},
4949

5050
_enhance: function() {
@@ -55,8 +55,9 @@ $.widget( "ui.controlgroup", {
5555
_destroy: function() {
5656
this._callChildMethod( "destroy" );
5757
this.element.removeAttr( "role" );
58-
this.element.removeClass( "ui-controlgroup ui-controlgroup-vertical ui-controlgroup-horizontal" )
59-
.children().removeClass( "ui-corner-all ui-corner-top" +
58+
this.element.removeClass(
59+
this._classes( "ui-controlgroup ui-controlgroup-vertical ui-controlgroup-horizontal" )
60+
).children().removeClass( "ui-corner-all ui-corner-top" +
6061
" ui-corner-bottom ui-corner-left ui-corner-tl ui-corner-tr" );
6162
},
6263

@@ -85,7 +86,7 @@ $.widget( "ui.controlgroup", {
8586
}
8687
if ( $.fn[ widget ] && selector ) {
8788
that.element.children( selector ).not( filter )[ widget ]( method ?
88-
method: options );
89+
method : options );
8990
}
9091
});
9192
},
@@ -110,7 +111,8 @@ $.widget( "ui.controlgroup", {
110111
var firstClasses = {},
111112
lastClasses = {},
112113
vertical = ( this.options.direction === "vertical" );
113-
this.element.addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction );
114+
this.element.addClass( this._classes( "ui-controlgroup ui-controlgroup-" +
115+
this.options.direction ) );
114116
this._callChildMethod( undefined );
115117
this.visible = this.element.children( ".ui-button" ).removeClass( function(index, css) {
116118
return ( css.match( /ui-corner-[a-z]*/g ) || [] ).join( " " );
@@ -120,7 +122,7 @@ $.widget( "ui.controlgroup", {
120122
.addClass( "ui-corner-" + ( vertical ? "top" : "left" ) );
121123
this.last = this.visible.filter( ":last" )
122124
.addClass( "ui-corner-" + ( vertical ? "bottom" : "right" ) );
123-
if( $.ui.selectmenu ) {
125+
if ( $.ui.selectmenu ) {
124126
if ( this.first.is( ".ui-selectmenu-button" ) && !vertical ) {
125127
firstClasses[ "ui-selectmenu-button-open" ] = "ui-corner-tl";
126128
firstClasses[ "ui-selectmenu-button-closed" ] = "ui-corner-left";
@@ -130,7 +132,7 @@ $.widget( "ui.controlgroup", {
130132
if ( this.last.is( ".ui-selectmenu-button" ) ) {
131133
if ( vertical ) {
132134
lastClasses[ "ui-selectmenu-button-open" ] = null;
133-
lastClasses[ "ui-selectmenu-button-closed" ] = "ui-corner-bottom"
135+
lastClasses[ "ui-selectmenu-button-closed" ] = "ui-corner-bottom";
134136
} else {
135137
lastClasses[ "ui-selectmenu-button-open" ] = "ui-corner-tr";
136138
lastClasses[ "ui-selectmenu-button-closed" ] = "ui-corner-right";

0 commit comments

Comments
 (0)