Skip to content

Commit 7759fb4

Browse files
committed
Menu: Rename icon option to icons.submenu
1 parent 1510f7e commit 7759fb4

File tree

5 files changed

+27
-10
lines changed

5 files changed

+27
-10
lines changed

demos/menu/topalignmenu.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
<script>
1414
$(function() {
1515
$( "#menu" ).menu({
16-
position: { of: "ul:has(a.ui-state-focus):last" }
16+
position: { of: "ul:has(a.ui-state-focus):last" },
17+
icons: {
18+
submenu: "ui-icon-carat-1-e"
19+
}
1720
});
1821
});
1922
</script>

tests/unit/menu/menu.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@
4444
</head>
4545
<body>
4646

47-
<h1 id="qunit-header">jQuery UI Menu Test Suite</h1>
48-
<h2 id="qunit-banner"></h2>
49-
<div id="qunit-testrunner-toolbar"></div>
50-
<h2 id="qunit-userAgent"></h2>
51-
<ol id="qunit-tests"></ol>
47+
<div id="qunit">jQuery UI Menu Test Suite</div>
5248
<div id="qunit-fixture">
5349

5450
<ul class="foo" id="menu1">

tests/unit/menu/menu_common.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
TestHelpers.commonWidgetTests( "menu", {
22
defaults: {
33
disabled: false,
4-
icon: "ui-icon-carat-1-e",
4+
icons: {
5+
submenu: "ui-icon-carat-1-e"
6+
},
57
menus: "ul",
68
position: {
79
my: "left top",

tests/unit/menu/menu_options.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,21 @@ test( "{ disabled: false }", function() {
4040
equal( logOutput(), "click,1,afterclick", "Click order not valid." );
4141
});
4242

43-
// TODO: test icon option
43+
test( "{ icons: default }", function() {
44+
expect( 1 );
45+
var element = $( "#menu2" ).menu();
46+
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" );
47+
});
48+
49+
test( "{ icons: { submenu: 'custom' } }", function() {
50+
expect( 1 );
51+
var element = $( "#menu2" ).menu({
52+
icons: {
53+
submenu: "custom-class"
54+
}
55+
});
56+
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon custom-class" );
57+
});
4458

4559
// TODO: test menus option
4660

ui/jquery.ui.menu.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ $.widget( "ui.menu", {
2222
defaultElement: "<ul>",
2323
delay: 300,
2424
options: {
25-
icon: "ui-icon-carat-1-e",
25+
icons: {
26+
submenu: "ui-icon-carat-1-e"
27+
},
2628
menus: "ul",
2729
position: {
2830
my: "left top",
@@ -276,7 +278,7 @@ $.widget( "ui.menu", {
276278
refresh: function() {
277279
// Initialize nested menus
278280
var menus,
279-
icon = this.options.icon,
281+
icon = this.options.icons.submenu,
280282
submenus = this.element.find( this.options.menus + ":not(.ui-menu)" )
281283
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
282284
.hide()

0 commit comments

Comments
 (0)