diff options
| -rw-r--r-- | tests/unit/menu/menu_common.js | 1 | ||||
| -rw-r--r-- | tests/visual/menu/menu.html | 5 | ||||
| -rw-r--r-- | ui/jquery.ui.menu.js | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js index 07295f1af..02e0befe8 100644 --- a/tests/unit/menu/menu_common.js +++ b/tests/unit/menu/menu_common.js @@ -7,6 +7,7 @@ TestHelpers.commonWidgetTests( "menu", { at: "right top" }, role: "menu", + icon: "ui-icon-carat-1-e", // callbacks blur: null, diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html index 5bda32eae..205cb10c9 100644 --- a/tests/visual/menu/menu.html +++ b/tests/visual/menu/menu.html @@ -26,7 +26,8 @@ $( "#menu6" ).menu({ menus: ".menuElement", - select: logger + select: logger, + icon: "ui-icon-carat-1-s" }); }); </script> @@ -212,7 +213,7 @@ </blockquote> </div> -<h2>Menu with custom markup, multi-line items</h2> +<h2>Menu with custom markup, multi-line items and a custom submenu icon</h2> <div class="menuElement" id="menu6"> <div class="address-item"> <a href="#"> diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 7861230aa..923421e52 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -28,6 +28,7 @@ $.widget( "ui.menu", { at: "right top" }, role: "menu", + icon: "ui-icon-carat-1-e", // callbacks blur: null, @@ -279,6 +280,7 @@ $.widget( "ui.menu", { refresh: function() { // Initialize nested menus var menus, + icon = this.options.icon, submenus = this.element.find( this.options.menus + ":not(.ui-menu)" ) .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) .hide() @@ -318,7 +320,7 @@ $.widget( "ui.menu", { var menu = $( this ), item = menu.prev( "a" ), submenuCarat = $( "<span>" ) - .addClass( "ui-menu-icon ui-icon ui-icon-carat-1-e" ) + .addClass( "ui-menu-icon ui-icon " + icon ) .data( "ui-menu-submenu-carat", true ); item |