Skip to content

Menu: Wrap menu items in a <div> #1342

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

Merged
merged 3 commits into from
Oct 30, 2014
Merged

Menu: Wrap menu items in a <div> #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de2ef2a
Menu: Wrap menu items in a <div>
tjvantoll Oct 25, 2014
4ac7b1f
Autocomplete: Re-add wrappers to menu items
tjvantoll Sep 24, 2014
e9643f6
Selectmenu: Re-add wrappers to menu items
tjvantoll Sep 26, 2014
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
2 changes: 1 addition & 1 deletion demos/autocomplete/custom-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
})
.autocomplete( "instance" )._renderItem = function( ul, item ) {
return $( "<li>" )
.append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
.append( "<div>" + item.label + "<br>" + item.desc + "</div>" )
.appendTo( ul );
};
});
Expand Down
16 changes: 8 additions & 8 deletions demos/menu/categories.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
<body>

<ul id="menu">
<li class="ui-widget-header">Category 1</li>
<li>Option 1</li>
<li>Option 2</li>
<li>Option 3</li>
<li class="ui-widget-header">Category 2</li>
<li>Option 4</li>
<li>Option 5</li>
<li>Option 6</li>
<li class="ui-widget-header"><div>Category 1</div></li>
<li><div>Option 1</div></li>
<li><div>Option 2</div></li>
<li><div>Option 3</div></li>
<li class="ui-widget-header"><div>Category 2</div></li>
<li><div>Option 4</div></li>
<li><div>Option 5</div></li>
<li><div>Option 6</div></li>
</ul>

<div class="demo-description">
Expand Down
40 changes: 20 additions & 20 deletions demos/menu/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,38 @@
<body>

<ul id="menu">
<li class="ui-state-disabled">Aberdeen</li>
<li>Ada</li>
<li>Adamsville</li>
<li>Addyston</li>
<li>Delphi
<li class="ui-state-disabled"><div>Aberdeen</div></li>
<li><div>Ada</div></li>
<li><div>Adamsville</div></li>
<li><div>Addyston</div></li>
<li><div>Delphi</div>
<ul>
<li class="ui-state-disabled">Ada</li>
<li>Saarland</li>
<li>Salzburg an der schönen Donau</li>
<li class="ui-state-disabled"><div>Ada</div></li>
<li><div>Saarland</div></li>
<li><div>Salzburg an der schönen Donau</div></li>
</ul>
</li>
<li>Saarland</li>
<li>Salzburg
<li><div>Saarland</div></li>
<li><div>Salzburg</div>
<ul>
<li>Delphi
<li><div>Delphi</div>
<ul>
<li>Ada</li>
<li>Saarland</li>
<li>Salzburg</li>
<li><div>Ada</div></li>
<li><div>Saarland</div></li>
<li><div>Salzburg</div></li>
</ul>
</li>
<li>Delphi
<li><div>Delphi</div>
<ul>
<li>Ada</li>
<li>Saarland</li>
<li>Salzburg</li>
<li><div>Ada</div></li>
<li><div>Saarland</div></li>
<li><div>Salzburg</div></li>
</ul>
</li>
<li>Perch</li>
<li><div>Perch</div></li>
</ul>
</li>
<li class="ui-state-disabled">Amesville</li>
<li class="ui-state-disabled"><div>Amesville</div></li>
</ul>

<div class="demo-description">
Expand Down
38 changes: 28 additions & 10 deletions demos/menu/icons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,38 @@
<body>

<ul id="menu">
<li><span class="ui-icon ui-icon-disk"></span>Save</li>
<li><span class="ui-icon ui-icon-zoomin"></span>Zoom In</li>
<li><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</li>
<li class="ui-state-disabled"><span class="ui-icon ui-icon-print"></span>Print...</li>
<li>
Playback
<div><span class="ui-icon ui-icon-disk"></span>Save</div>
</li>
<li>
<div><span class="ui-icon ui-icon-zoomin"></span>Zoom In</div>
</li>
<li>
<div><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</div>
</li>
<li class="ui-state-disabled">
<div><span class="ui-icon ui-icon-print"></span>Print...</div>
</li>
<li>
<div>Playback</div>
<ul>
<li><span class="ui-icon ui-icon-seek-start"></span>Prev</li>
<li><span class="ui-icon ui-icon-stop"></span>Stop</li>
<li><span class="ui-icon ui-icon-play"></span>Play</li>
<li><span class="ui-icon ui-icon-seek-end"></span>Next</li>
<li>
<div><span class="ui-icon ui-icon-seek-start"></span>Prev</div>
</li>
<li>
<div><span class="ui-icon ui-icon-stop"></span>Stop</div>
</li>
<li>
<div><span class="ui-icon ui-icon-play"></span>Play</div>
</li>
<li>
<div><span class="ui-icon ui-icon-seek-end"></span>Next</div>
</li>
</ul>
</li>
<li>Learn more about this menu</li>
<li>
<div>Learn more about this menu</div>
</li>
</ul>

<div class="demo-description">
Expand Down
9 changes: 5 additions & 4 deletions demos/selectmenu/custom_render.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
$(function() {
$.widget( "custom.iconselectmenu", $.ui.selectmenu, {
_renderItem: function( ul, item ) {
var li = $( "<li>", { text: item.label } );
var li = $( "<li>" ),
wrapper = $( "<div>", { text: item.label } );

if ( item.disabled ) {
li.addClass( "ui-state-disabled" );
Expand All @@ -26,9 +27,9 @@
style: item.element.attr( "data-style" ),
"class": "ui-icon " + item.element.attr( "data-class" )
})
.appendTo( li );
.appendTo( wrapper );

return li.appendTo( ul );
return li.append( wrapper ).appendTo( ul );
}
});

Expand Down Expand Up @@ -63,7 +64,7 @@
}

/* select with custom icons */
.ui-selectmenu-menu .ui-menu.customicons .ui-menu-item {
.ui-selectmenu-menu .ui-menu.customicons .ui-menu-item-wrapper {
padding: 0.5em 0 0.5em 3em;
}
.ui-selectmenu-menu .ui-menu.customicons .ui-menu-item .ui-icon {
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/autocomplete/autocomplete_core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ test( "prevent form submit on enter when menu is active", function() {
event = $.Event( "keydown" );
event.keyCode = $.ui.keyCode.DOWN;
element.trigger( event );
equal( menu.find( ".ui-menu-item.ui-state-focus" ).length, 1, "menu item is active" );
equal( menu.find( ".ui-menu-item-wrapper.ui-state-focus" ).length, 1,
"menu item is active" );

event = $.Event( "keydown" );
event.keyCode = $.ui.keyCode.ENTER;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/autocomplete/autocomplete_options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function autoFocusTest( afValue, focusedLength ) {
open: function() {
equal(
element.autocomplete( "widget" )
.children( ".ui-menu-item.ui-state-focus" )
.find( ".ui-menu-item-wrapper.ui-state-focus" )
.length,
focusedLength,
"first item is " + (afValue ? "" : "not") + " auto focused" );
Expand Down
Loading