Skip to content
Permalink
Browse files

Selectmenu: make sure ui-state-focus class is set on button after ini…

…tial focus
  • Loading branch information...
fnagel committed Oct 29, 2013
1 parent 027d8d4 commit 11186cc10a3decf8fcc236537edc8ca2a61bd176
Showing with 6 additions and 8 deletions.
  1. +6 −8 ui/jquery.ui.selectmenu.js
@@ -56,7 +56,8 @@ $.widget( "ui.selectmenu", {
},

_drawButton: function() {
var tabindex = this.element.attr( "tabindex" );
var that = this,
tabindex = this.element.attr( "tabindex" );

// Associate existing label with the new button
this.label = $( "label[for='" + this.ids.element + "']" ).attr( "for", this.ids.button );
@@ -96,6 +97,10 @@ $.widget( "ui.selectmenu", {
this._setOption( "width", this.options.width );

this._on( this.button, this._buttonEvents );
this.button.one( "focusin", function() {
// Delay rendering the menu items until the button receives focus
that._refreshMenu();
});
this._hoverable( this.button );
this._focusable( this.button );
},
@@ -329,13 +334,6 @@ $.widget( "ui.selectmenu", {
},

_buttonEvents: {
focusin: function() {
// Delay rendering the menu items until the button receives focus
if ( !this.menuItems ) {
this._refreshMenu();
}
this._off( this.button, "focusin" );
},
click: "_toggle",
keydown: function( event ) {
var preventDefault = true;

0 comments on commit 11186cc

Please sign in to comment.
You can’t perform that action at this time.