Skip to content

Commit e1ec6f8

Browse files
committed
Menu: Refactor to get rid of var that. Cleanup some odd formattings and unneeded temp vars
1 parent ae0c4e4 commit e1ec6f8

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

tests/visual/menu/menu.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
right: 10,
1717
top: 10
1818
}).appendTo(document.body).themeswitcher();
19-
19+
2020
function create() {
2121
menus.menu({
2222
select: function(event, ui) {
2323
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
2424
}
2525
});
2626
}
27-
28-
var menus = $("#menu1, #menu2, #menu3, #menu4");
27+
28+
var menus = $("#menu1, #menu2, #menu3, .menu4");
2929
create();
3030

3131
$("#toggle-destroy").toggle(function() {
@@ -41,11 +41,11 @@
4141
<style>
4242
body { font-size:62.5%; }
4343
.ui-menu { width: 200px; margin-bottom: 2em; }
44-
#menu4 { height: 200px; overflow: auto; }
44+
.menu4 { height: 200px; overflow: auto; }
4545
</style>
4646
</head>
4747
<body>
48-
48+
4949
<ul id="menu1">
5050
<li><a href="#">Aberdeen</a></li>
5151
<li><a href="#">Ada</a></li>
@@ -132,7 +132,7 @@
132132
</li>
133133
</ul>
134134

135-
<ul id="menu4">
135+
<ul class="menu4">
136136
<li><a href="#">Aberdeen</a></li>
137137
<li><a href="#">Ada</a></li>
138138
<li><a href="#">Adamsville</a></li>

ui/jquery.ui.menu.js

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,35 +220,33 @@ $.widget( "ui.menu", {
220220
},
221221

222222
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" );
232230

233231
// 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+
});
245243

246244
submenus.each( function() {
247245
var menu = $( this ),
248246
item = menu.prev( "a" );
249247

250248
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>' );
252250
menu.attr( "aria-labelledby", item.attr( "id" ) );
253251
});
254252
},

0 commit comments

Comments
 (0)