Menu: Expose the submenu indicator icon as an icon option

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 07295f1af03aebb5574720ac44d45211980a6033..02e0befe8a797fcc353d8e92acbd6a003a560d62 100644 (file)
--- 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 5bda32eae9aa8fa6ab61e99ad5eae17845135658..205cb10c9afa774f0cf4968d19b8ed8758cb8d99 100644 (file)
--- 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 7861230aa72184156a17e6877c47fc43dddc0b49..923421e529bd86b17fd9e39fb95336deecf07599 100644 (file)
--- 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