Skip to content

Selectmenu: Fix style issues #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Selectmenu: Fix style issues #1498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 64 additions & 64 deletions ui/selectmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
//>>css.structure: ../themes/base/selectmenu.css
//>>css.theme: ../themes/base/theme.css

(function( factory ) {
( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define([
define( [
"jquery",
"./core",
"./widget",
Expand All @@ -32,7 +32,7 @@
// Browser globals
factory( jQuery );
}
}(function( $ ) {
}( function( $ ) {

return $.widget( "ui.selectmenu", {
version: "@VERSION",
Expand Down Expand Up @@ -96,7 +96,7 @@ return $.widget( "ui.selectmenu", {
this.button.focus();
event.preventDefault();
}
});
} );

// Hide original select element
this.element.hide();
Expand All @@ -111,7 +111,7 @@ return $.widget( "ui.selectmenu", {
"aria-owns": this.ids.menu,
"aria-haspopup": "true",
title: this.element.attr( "title" )
})
} )
.insertAfter( this.element );

this._addClass( this.button, "ui-selectmenu-button ui-selectmenu-button-closed",
Expand All @@ -135,7 +135,7 @@ return $.widget( "ui.selectmenu", {
if ( !that._rendered ) {
that._refreshMenu();
}
});
} );
this._hoverable( this.button );
this._focusable( this.button );
},
Expand All @@ -148,7 +148,7 @@ return $.widget( "ui.selectmenu", {
"aria-hidden": "true",
"aria-labelledby": this.ids.button,
id: this.ids.menu
});
} );

// Wrap menu
this.menuWrap = $( "<div>" ).append( this.menu );
Expand All @@ -157,7 +157,7 @@ return $.widget( "ui.selectmenu", {

// Initialize menu widget
this.menuInstance = this.menu
.menu({
.menu( {
classes: {
"ui-menu": "ui-corner-bottom"
},
Expand Down Expand Up @@ -187,7 +187,7 @@ return $.widget( "ui.selectmenu", {
that.button.attr( "aria-activedescendant",
that.menuItems.eq( item.index ).attr( "id" ) );
}
})
} )
.menu( "instance" );

// Don't close the menu on mouseleave
Expand Down Expand Up @@ -323,7 +323,7 @@ return $.widget( "ui.selectmenu", {
if ( item.optgroup !== currentOptgroup ) {
li = $( "<li>", {
text: item.optgroup
});
} );
that._addClass( li, "ui-selectmenu-optgroup", "ui-menu-divider" +
( item.element.parent( "optgroup" ).prop( "disabled" ) ?
" ui-state-disabled" :
Expand All @@ -335,7 +335,7 @@ return $.widget( "ui.selectmenu", {
}

that._renderItemData( ul, item );
});
} );
},

_renderItemData: function( ul, item ) {
Expand All @@ -346,7 +346,7 @@ return $.widget( "ui.selectmenu", {
var li = $( "<li>" ),
wrapper = $( "<div>", {
title: item.element.attr( "title" )
});
} );

if ( item.disabled ) {
this._addClass( li, null, "ui-state-disabled" );
Expand Down Expand Up @@ -455,54 +455,54 @@ return $.widget( "ui.selectmenu", {
keydown: function( event ) {
var preventDefault = true;
switch ( event.keyCode ) {
case $.ui.keyCode.TAB:
case $.ui.keyCode.ESCAPE:
this.close( event );
preventDefault = false;
break;
case $.ui.keyCode.ENTER:
if ( this.isOpen ) {
this._selectFocusedItem( event );
}
break;
case $.ui.keyCode.UP:
if ( event.altKey ) {
this._toggle( event );
} else {
this._move( "prev", event );
}
break;
case $.ui.keyCode.DOWN:
if ( event.altKey ) {
this._toggle( event );
} else {
this._move( "next", event );
}
break;
case $.ui.keyCode.SPACE:
if ( this.isOpen ) {
this._selectFocusedItem( event );
} else {
this._toggle( event );
}
break;
case $.ui.keyCode.LEFT:
case $.ui.keyCode.TAB:
case $.ui.keyCode.ESCAPE:
this.close( event );
preventDefault = false;
break;
case $.ui.keyCode.ENTER:
if ( this.isOpen ) {
this._selectFocusedItem( event );
}
break;
case $.ui.keyCode.UP:
if ( event.altKey ) {
this._toggle( event );
} else {
this._move( "prev", event );
break;
case $.ui.keyCode.RIGHT:
}
break;
case $.ui.keyCode.DOWN:
if ( event.altKey ) {
this._toggle( event );
} else {
this._move( "next", event );
break;
case $.ui.keyCode.HOME:
case $.ui.keyCode.PAGE_UP:
this._move( "first", event );
break;
case $.ui.keyCode.END:
case $.ui.keyCode.PAGE_DOWN:
this._move( "last", event );
break;
default:
this.menu.trigger( event );
preventDefault = false;
}
break;
case $.ui.keyCode.SPACE:
if ( this.isOpen ) {
this._selectFocusedItem( event );
} else {
this._toggle( event );
}
break;
case $.ui.keyCode.LEFT:
this._move( "prev", event );
break;
case $.ui.keyCode.RIGHT:
this._move( "next", event );
break;
case $.ui.keyCode.HOME:
case $.ui.keyCode.PAGE_UP:
this._move( "first", event );
break;
case $.ui.keyCode.END:
case $.ui.keyCode.PAGE_DOWN:
this._move( "last", event );
break;
default:
this.menu.trigger( event );
preventDefault = false;
}

if ( preventDefault ) {
Expand Down Expand Up @@ -537,10 +537,10 @@ return $.widget( "ui.selectmenu", {
_setAria: function( item ) {
var id = this.menuItems.eq( item.index ).attr( "id" );

this.button.attr({
this.button.attr( {
"aria-labelledby": id,
"aria-activedescendant": id
});
} );
this.menu.attr( "aria-activedescendant", id );
},

Expand Down Expand Up @@ -647,9 +647,9 @@ return $.widget( "ui.selectmenu", {
_parseOptions: function( options ) {
var that = this,
data = [];
options.each(function( index, item ) {
options.each( function( index, item ) {
data.push( that._parseOption( $( item ), index ) );
});
} );
this.items = data;
},

Expand All @@ -673,6 +673,6 @@ return $.widget( "ui.selectmenu", {
this.element.removeUniqueId();
this.label.attr( "for", this.ids.element );
}
});
} );

}));
} ) );