@@ -220,35 +220,33 @@ $.widget( "ui.menu", {
220
220
} ,
221
221
222
222
refresh : function ( ) {
223
- var that = this ,
224
-
225
- // initialize nested menus
226
- submenus = this . element . find ( "ul:not(.ui-menu)" )
227
- . addClass ( "ui-menu ui-widget ui-widget-content ui-corner-all" )
228
- . attr ( "role" , "menu" )
229
- . hide ( )
230
- . attr ( "aria-hidden" , "true" )
231
- . attr ( "aria-expanded" , "false" ) ,
223
+ // initialize nested menus
224
+ var submenus = this . element . find ( "ul:not(.ui-menu)" )
225
+ . addClass ( "ui-menu ui-widget ui-widget-content ui-corner-all" )
226
+ . attr ( "role" , "menu" )
227
+ . hide ( )
228
+ . attr ( "aria-hidden" , "true" )
229
+ . attr ( "aria-expanded" , "false" ) ;
232
230
233
231
// don't refresh list items that are already adapted
234
- items = submenus . add ( this . element ) . children ( "li:not(.ui-menu-item):has(a)" )
235
- . addClass ( " ui-menu-item" )
236
- . attr ( "role" , "presentation" ) ;
237
-
238
- items . children ( "a" )
239
- . addClass ( "ui-corner-all" )
240
- . attr ( "tabIndex" , - 1 )
241
- . attr ( "role" , "menuitem" )
242
- . attr ( "id" , function ( i ) {
243
- return that . element . attr ( "id" ) + "-" + i ;
244
- } ) ;
232
+ var menuId = this . menuId ;
233
+ submenus . add ( this . element ) . children ( "li:not(. ui-menu-item):has(a) " )
234
+ . addClass ( "ui-menu-item" )
235
+ . attr ( "role" , "presentation" )
236
+ . children ( "a" )
237
+ . addClass ( "ui-corner-all" )
238
+ . attr ( "tabIndex" , - 1 )
239
+ . attr ( "role" , "menuitem" )
240
+ . attr ( "id" , function ( i ) {
241
+ return menuId + "-" + i ;
242
+ } ) ;
245
243
246
244
submenus . each ( function ( ) {
247
245
var menu = $ ( this ) ,
248
246
item = menu . prev ( "a" ) ;
249
247
250
248
item . attr ( "aria-haspopup" , "true" )
251
- . prepend ( '<span class="ui-menu-icon ui-icon ui-icon-carat-1-e"></span>' ) ;
249
+ . prepend ( '<span class="ui-menu-icon ui-icon ui-icon-carat-1-e"></span>' ) ;
252
250
menu . attr ( "aria-labelledby" , item . attr ( "id" ) ) ;
253
251
} ) ;
254
252
} ,
0 commit comments