Skip to content
Permalink
Browse files

Menu: Reset ui-menu-icons class in refresh. Fixes #9377: Menu: Refres…

…hing should recheck for menu icons
  • Loading branch information
tjvantoll committed Jun 13, 2013
1 parent b5c41a2 commit 91b7b9f9ab2e5baa31e37f34600457599409e161
Showing with 15 additions and 0 deletions.
  1. +13 −0 tests/unit/menu/menu_methods.js
  2. +2 −0 ui/jquery.ui.menu.js
@@ -69,6 +69,19 @@ test( "refresh submenu", function() {
equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
});

test( "refresh icons (see #9377)", function() {
expect( 3 );
var element = $( "#menu1" ).menu();
ok( !element.hasClass( "ui-menu-icons") );
element.find( "li:first a" ).html( '<span class="ui-icon ui-icon-disk"></span>Save</a>' );
element.menu( "refresh" );

ok( element.hasClass( "ui-menu-icons" ) );
element.find( "li:first a" ).html( "Save" );
element.menu( "refresh" );
ok( !element.hasClass( "ui-menu-icons") );
});

test( "widget", function() {
expect( 2 );
var element = $( "#menu1" ).menu(),
@@ -282,6 +282,8 @@ $.widget( "ui.menu", {
icon = this.options.icons.submenu,
submenus = this.element.find( this.options.menus );

this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );

// Initialize nested menus
submenus.filter( ":not(.ui-menu)" )
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )

0 comments on commit 91b7b9f

Please sign in to comment.
You can’t perform that action at this time.