Skip to content

Commit db3fabe

Browse files
committed
Menu: Expose the submenu indicator icon as an icon option
1 parent 1a22a67 commit db3fabe

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

tests/unit/menu/menu_common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ TestHelpers.commonWidgetTests( "menu", {
77
at: "right top"
88
},
99
role: "menu",
10+
icon: "ui-icon-carat-1-e",
1011

1112
// callbacks
1213
blur: null,

tests/visual/menu/menu.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626

2727
$( "#menu6" ).menu({
2828
menus: ".menuElement",
29-
select: logger
29+
select: logger,
30+
icon: "ui-icon-carat-1-s"
3031
});
3132
});
3233
</script>
@@ -212,7 +213,7 @@ <h2>Menu with custom markup</h2>
212213
</blockquote>
213214
</div>
214215

215-
<h2>Menu with custom markup, multi-line items</h2>
216+
<h2>Menu with custom markup, multi-line items and a custom submenu icon</h2>
216217
<div class="menuElement" id="menu6">
217218
<div class="address-item">
218219
<a href="#">

ui/jquery.ui.menu.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ $.widget( "ui.menu", {
2828
at: "right top"
2929
},
3030
role: "menu",
31+
icon: "ui-icon-carat-1-e",
3132

3233
// callbacks
3334
blur: null,
@@ -279,6 +280,7 @@ $.widget( "ui.menu", {
279280
refresh: function() {
280281
// Initialize nested menus
281282
var menus,
283+
icon = this.options.icon,
282284
submenus = this.element.find( this.options.menus + ":not(.ui-menu)" )
283285
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
284286
.hide()
@@ -318,7 +320,7 @@ $.widget( "ui.menu", {
318320
var menu = $( this ),
319321
item = menu.prev( "a" ),
320322
submenuCarat = $( "<span>" )
321-
.addClass( "ui-menu-icon ui-icon ui-icon-carat-1-e" )
323+
.addClass( "ui-menu-icon ui-icon " + icon )
322324
.data( "ui-menu-submenu-carat", true );
323325

324326
item

0 commit comments

Comments
 (0)