diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-09-13 00:24:43 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-09-13 00:24:43 +0200 |
| commit | e1ec6f8ebb509b636840dfad11aa062c9877beac (patch) | |
| tree | f8935d2c2b055e19895063d344825fab181a81ba | |
| parent | ae0c4e44ff4adee60ad4e9662661ce9564031c16 (diff) | |
| download | jquery-ui-e1ec6f8ebb509b636840dfad11aa062c9877beac.tar.gz jquery-ui-e1ec6f8ebb509b636840dfad11aa062c9877beac.zip | |
Menu: Refactor to get rid of var that. Cleanup some odd formattings and unneeded temp vars
| -rw-r--r-- | tests/visual/menu/menu.html | 12 | ||||
| -rw-r--r-- | ui/jquery.ui.menu.js | 40 |
2 files changed, 25 insertions, 27 deletions
diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html index 5720d04d9..195488184 100644 --- a/tests/visual/menu/menu.html +++ b/tests/visual/menu/menu.html @@ -16,7 +16,7 @@ right: 10, top: 10 }).appendTo(document.body).themeswitcher(); - + function create() { menus.menu({ select: function(event, ui) { @@ -24,8 +24,8 @@ } }); } - - var menus = $("#menu1, #menu2, #menu3, #menu4"); + + var menus = $("#menu1, #menu2, #menu3, .menu4"); create(); $("#toggle-destroy").toggle(function() { @@ -41,11 +41,11 @@ <style> body { font-size:62.5%; } .ui-menu { width: 200px; margin-bottom: 2em; } - #menu4 { height: 200px; overflow: auto; } + .menu4 { height: 200px; overflow: auto; } </style> </head> <body> - + <ul id="menu1"> <li><a href="#">Aberdeen</a></li> <li><a href="#">Ada</a></li> @@ -132,7 +132,7 @@ </li> </ul> -<ul id="menu4"> +<ul class="menu4"> <li><a href="#">Aberdeen</a></li> <li><a href="#">Ada</a></li> <li><a href="#">Adamsville</a></li> diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index bfe35efb5..9cb6afe32 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -220,35 +220,33 @@ $.widget( "ui.menu", { }, refresh: function() { - var that = this, - - // initialize nested menus - submenus = this.element.find( "ul:not(.ui-menu)" ) - .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) - .attr( "role", "menu" ) - .hide() - .attr( "aria-hidden", "true" ) - .attr( "aria-expanded", "false" ), + // initialize nested menus + var submenus = this.element.find( "ul:not(.ui-menu)" ) + .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) + .attr( "role", "menu" ) + .hide() + .attr( "aria-hidden", "true" ) + .attr( "aria-expanded", "false" ); // don't refresh list items that are already adapted - items = submenus.add( this.element ).children( "li:not(.ui-menu-item):has(a)" ) - .addClass( "ui-menu-item" ) - .attr( "role", "presentation" ); - - items.children( "a" ) - .addClass( "ui-corner-all" ) - .attr( "tabIndex", -1 ) - .attr( "role", "menuitem" ) - .attr( "id", function( i ) { - return that.element.attr( "id" ) + "-" + i; - }); + var menuId = this.menuId; + submenus.add( this.element ).children( "li:not(.ui-menu-item):has(a)" ) + .addClass( "ui-menu-item" ) + .attr( "role", "presentation" ) + .children( "a" ) + .addClass( "ui-corner-all" ) + .attr( "tabIndex", -1 ) + .attr( "role", "menuitem" ) + .attr( "id", function( i ) { + return menuId + "-" + i; + }); submenus.each( function() { var menu = $( this ), item = menu.prev( "a" ); item.attr( "aria-haspopup", "true" ) - .prepend( '<span class="ui-menu-icon ui-icon ui-icon-carat-1-e"></span>' ); + .prepend( '<span class="ui-menu-icon ui-icon ui-icon-carat-1-e"></span>' ); menu.attr( "aria-labelledby", item.attr( "id" ) ); }); }, |