Skip to content

Commit bff8277

Browse files
arschmitzscottgonzalez
authored andcommitted
Selectmenu: Prepend icon and move overflow to text span
Fixes #14938 Closes gh-1685
1 parent bf5d6f3 commit bff8277

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

tests/unit/selectmenu/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test( "markup structure", function( assert ) {
2121
assert.lacksClasses( button, "ui-selectmenu-button-open ui-selectmenu-open" );
2222
assert.hasClasses( menuWrap, "ui-selectmenu-menu" );
2323
assert.lacksClasses( menuWrap, "ui-selectmenu-menu-open" );
24-
assert.strictEqual( icon[ 0 ], button.children().last()[ 0 ], "Icon is last child of button" );
24+
assert.strictEqual( icon[ 0 ], button.children()[ 0 ], "Icon is first child of button" );
2525
} );
2626

2727
asyncTest( "accessibility", function() {

themes/base/selectmenu.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@
3333
.ui-selectmenu-open {
3434
display: block;
3535
}
36-
.ui-selectmenu-button.ui-button {
37-
text-align: left;
36+
.ui-selectmenu-text {
37+
display: block;
38+
margin-right: 20px;
3839
overflow: hidden;
3940
text-overflow: ellipsis;
41+
}
42+
.ui-selectmenu-button.ui-button {
43+
text-align: left;
4044
white-space: nowrap;
4145
width: 14em;
4246
}

ui/widgets/selectmenu.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,10 @@ return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
119119
this._addClass( this.button, "ui-selectmenu-button ui-selectmenu-button-closed",
120120
"ui-button ui-widget" );
121121

122-
this.buttonItem = this._renderButtonItem( item )
123-
.appendTo( this.button );
124-
125122
icon = $( "<span>" ).appendTo( this.button );
126123
this._addClass( icon, "ui-selectmenu-icon", "ui-icon " + this.options.icons.button );
124+
this.buttonItem = this._renderButtonItem( item )
125+
.appendTo( this.button );
127126

128127
if ( this.options.width !== false ) {
129128
this._resizeButton();

0 commit comments

Comments
 (0)