Skip to content

Commit a0b707b

Browse files
committed
Menu: Update for menu wrapper
1 parent 913edd3 commit a0b707b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tests/unit/menu/menu_common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ TestHelpers.commonWidgetTests( "menu", {
55
"ui-menu-icons": "",
66
"ui-menu-icon": "",
77
"ui-menu-item": "",
8+
"ui-menu-item-wrapper": "",
89
"ui-menu-divider": ""
910
},
1011
disabled: false,

ui/menu.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ return $.widget( "ui.menu", {
3535
"ui-menu-icons": "",
3636
"ui-menu-icon": "",
3737
"ui-menu-item": "",
38-
"ui-menu-divider": ""
38+
"ui-menu-divider": "",
39+
"ui-menu-item-wrapper": ""
3940
},
4041
icons: {
4142
submenu: "ui-icon-caret-1-e"
@@ -177,9 +178,9 @@ return $.widget( "ui.menu", {
177178
.removeClass( this._classes( "ui-menu-item" ) )
178179
.removeAttr( "role" )
179180
.removeAttr( "aria-disabled" )
180-
.children( ".ui-menu-item-wrapper" )
181+
.find( ".ui-menu-item-wrapper" )
181182
.removeUniqueId()
182-
.removeClass( this._classes( "ui-menu-item-wrapper" ) + "ui-state-hover" )
183+
.removeClass( this._classes( "ui-menu-item-wrapper" ) + " ui-state-hover" )
183184
.removeAttr( "tabIndex" )
184185
.removeAttr( "role" )
185186
.removeAttr( "aria-haspopup" )
@@ -305,9 +306,9 @@ return $.widget( "ui.menu", {
305306
.each(function() {
306307
var menu = $( this ),
307308
item = menu.prev(),
308-
submenuCarat = $( "<span>" )
309+
submenuCaret = $( "<span>" )
309310
.addClass( that._classes( "ui-menu-icon" ) + " ui-icon " + icon )
310-
.data( "ui-menu-submenu-carat", true );
311+
.data( "ui-menu-submenu-caret", true );
311312

312313
item
313314
.attr( "aria-haspopup", "true" )
@@ -363,6 +364,7 @@ return $.widget( "ui.menu", {
363364
break;
364365
case "ui-menu-icon":
365366
case "ui-menu-item":
367+
case "ui-menu-item-wrapper":
366368
case "ui-menu-divider":
367369
return this.element.find( classKey );
368370
}

0 commit comments

Comments
 (0)