Merge branch 'master' of git://github.com/jquery/jquery-ui

NDMarcel · NDMarcel · commit 993a07935ea8 · 2011-04-24T13:03:09.000+02:00
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
@@ -26,11 +26,9 @@
 .ui-menu .ui-menu-item a {
 	text-decoration:none;
 	display:block;
-	padding:.2em .4em;
+	padding: 2px .4em;
 	line-height:1.5;
 	zoom:1;
-}
-.ui-menu .ui-menu-item a {
 	font-weight: normal;
 }
 .ui-menu .ui-menu-item a.ui-state-focus,
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
@@ -237,6 +237,9 @@ $.widget("ui.menu", {
 		// need to remove the attribute before adding it for the screenreader to pick up the change
 		// see http://groups.google.com/group/jquery-a11y/msg/929e0c1e8c5efc8f
 		this.element.removeAttr("aria-activedescendant").attr("aria-activedescendant", self.itemId)
+
+		// highlight active parent menu item, if any
+		this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active");
 		
 		self.timer = setTimeout(function() {
 			self._close();
@@ -285,8 +288,6 @@ $.widget("ui.menu", {
 		);
 
 		submenu.show().position(position);
-		
-		this.active.find(">a:first").addClass("ui-state-active");
 	},
 	
 	closeAll: function() {
