Merge branch 'master' into selectmenu

1 files changed, 177 insertions, 148 deletions

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 9e68e0c67..6b03efb3c 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -7,7 +7,7 @@ module("menu: events");
 
 test("handle click on menu", function() {
 	expect(1);
-	var ac = $('#menu1').menu({
+	var menu = $('#menu1').menu({
 		select: function(event, ui) {
 			menu_log();
 		}
@@ -15,15 +15,15 @@ test("handle click on menu", function() {
 	menu_log("click",true);
 	menu_click($('#menu1'),"1");
 	menu_log("afterclick");
-	menu_click( ac,"2");
+	menu_click( menu,"2");
 	menu_click($('#menu1'),"3");
-	menu_click( ac,"1");
+	menu_click( menu,"1");
 	equals( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
 });
 
 test("handle click on custom item menu", function() {
 	expect(1);
-	var ac = $('#menu5').menu({
+	var menu = $('#menu5').menu({
 		select: function(event, ui) {
 			menu_log();
 		},
@@ -32,9 +32,9 @@ test("handle click on custom item menu", function() {
 	menu_log("click",true);
 	menu_click($('#menu5'),"1");
 	menu_log("afterclick");
-	menu_click( ac,"2");
+	menu_click( menu,"2");
 	menu_click($('#menu5'),"3");
-	menu_click( ac,"1");
+	menu_click( menu,"1");
 	equals( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
 });
 
@@ -87,48 +87,55 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	var $menu = $( "#menu2" ).menu();
 
 	$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
-	setTimeout(function() {
+	setTimeout( menumouseleave1, 350 );
+
+	function menumouseleave1() {
 		equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
 		$menu.find( "li:nth-child(7) li:first" ).trigger( "mouseover" );
-		setTimeout(function() {
-			equal( $menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-			$menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
-			setTimeout(function() {
-				equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-				$menu.trigger( "mouseleave" );
-				setTimeout(function() {
-					equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
-					start();
-				}, 1400);
-			}, 1050);
-		}, 700);
-	}, 350);
+		setTimeout( menumouseleave2, 350 );
+	}
+	function menumouseleave2() {
+		equal( $menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		$menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		setTimeout( menumouseleave3, 350 );
+	}
+	function menumouseleave3() {
+		equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		$menu.trigger( "mouseleave" );
+		setTimeout( menumouseleave4, 350 );
+	}
+	function menumouseleave4() {
+		equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		start();
+	}
 });
 
-asyncTest( "handle custom menu item submenu auto collapse: mouseleave", function() {
-	expect( 5 );
+asyncTest( "handle submenu auto collapse: mouseleave", function() {
+	expect( 4 );
 	var $menu = $( "#menu5" ).menu( { menus: "div" } );
 
-	$menu.children( ":nth-child(7)" ).trigger( "mouseover" );
-	setTimeout(function() {
+	$menu.find( ":nth-child(7)" ).trigger( "mouseover" );
+	setTimeout( menumouseleave1, 350 );
+
+	function menumouseleave1() {
 		equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		$menu.children( ":nth-child(7)" ).find( "div:first" ).children( ":first" ).trigger( "mouseover" );
-		setTimeout(function() {
-			equal( $menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-			$menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
-			setTimeout(function() {
-				equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-				$menu.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN });
-				ok( $menu.find( ".ui-state-active" ).is( "#menu5 :nth-child(7) a" ),
-					"down keypress selected an item from the first submenu" );
-				$menu.trigger( "mouseleave" );
-				setTimeout(function() {
-					equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
-					start();
-				}, 1400);
-			}, 1050);
-		}, 700);
-	}, 350);
+		$menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ).trigger( "mouseover" );
+		setTimeout( menumouseleave2, 350 );
+	}
+	function menumouseleave2() {
+		equal( $menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		$menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		setTimeout( menumouseleave3, 350 );
+	}
+	function menumouseleave3() {
+		equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		$menu.trigger( "mouseleave" );
+		setTimeout( menumouseleave4, 350 );
+	}
+	function menumouseleave4() {
+		equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		start();
+	}
 });
 
 
@@ -144,13 +151,14 @@ test("handle keyboard navigation on menu without scroll and without submenus", f
 	});
 
 	menu_log("keydown",true);
+	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+	equals( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
 
 	menu_log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equals( $("#log").html(), "0,keydown,", "Keydown UP");
+	equals( $("#log").html(), "1,keydown,", "Keydown UP");
 
 	menu_log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
@@ -205,81 +213,90 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	});
 
 	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+	element.one( "menufocus", function( event, ui ) {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equals( $("#log").html(), "2,1,keydown,", "Keydown DOWN");
+		setTimeout( menukeyboard1, 50 );
+	});
+	element.focus();
 
-	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equals( $("#log").html(), "0,keydown,", "Keydown UP");
+	function menukeyboard1() {
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equals( $("#log").html(), "0,1,keydown,", "Keydown UP");
 
-	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
-	setTimeout( function() {
-		equals( $("#log").html(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)");
-	}, 50);
+		setTimeout( function() {
+			equals( $("#log").html(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)");
+		}, 50);
+		setTimeout( menukeyboard2, 50 );
+	}
 
-	setTimeout( function() {
+	function menukeyboard2() {
 		menu_log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equals( $("#log").html(), "4,keydown,", "Keydown LEFT (close submenu)");
 
 		//re-open submenu
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		setTimeout( menukeyboard3, 50 );
+	}
 
-		setTimeout( function() {
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-			equals( $("#log").html(), "2,keydown,", "Keydown PAGE_DOWN");
-
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-			equals( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
+	function menukeyboard3() {
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equals( $("#log").html(), "2,keydown,", "Keydown PAGE_DOWN");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-			equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equals( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-			equals( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-			equals( $("#log").html(), "2,keydown,", "Keydown END");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equals( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-			equals( $("#log").html(), "0,keydown,", "Keydown HOME");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+		equals( $("#log").html(), "2,keydown,", "Keydown END");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-			equals( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+		equals( $("#log").html(), "0,keydown,", "Keydown HOME");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equals( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
 
-			setTimeout( function() {
-				equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		setTimeout( menukeyboard4, 50 );
+	}
 
-				menu_log("keydown",true);
-				element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-				equals( $("#log").html(), "Ada,keydown,", "Keydown ENTER (select item)");
+	function menukeyboard4() {
+		equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
 
-				start();
-			}, 200);
-		}, 150);
-	}, 100);
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equals( $("#log").html(), "Ada,keydown,", "Keydown ENTER (select item)");
 
+		start();
+	}
 });
 
 test("handle keyboard navigation on menu with scroll and without submenus", function() {
@@ -294,13 +311,15 @@ test("handle keyboard navigation on menu with scroll and without submenus", func
 	});
 
 	menu_log("keydown",true);
+	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+	equals( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
 
 	menu_log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equals( $("#log").html(), "0,keydown,", "Keydown UP");
+	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+	equals( $("#log").html(), "0,1,keydown,", "Keydown UP");
 
 	menu_log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
@@ -363,78 +382,88 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 	});
 
 	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+	element.one( "menufocus", function( event, ui ) {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equals( $("#log").html(), "2,1,keydown,", "Keydown DOWN");
+		setTimeout( menukeyboard1, 50 );
+	});
+	element.focus();
+	
 
-	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equals( $("#log").html(), "0,keydown,", "Keydown UP");
+	function menukeyboard1() {
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+		equals( $("#log").html(), "0,1,keydown,", "Keydown UP");
 
-	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-	menu_log("keydown",true);
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
-	setTimeout( function() {
-		equals( $("#log").html(), "0,1,keydown,", "Keydown RIGHT (open submenu)");
-	}, 50);
+		setTimeout( function() {
+			equals( $("#log").html(), "0,1,keydown,", "Keydown RIGHT (open submenu)");
+		}, 50);
+		setTimeout( menukeyboard2, 50 );
+	}
 
-	setTimeout( function() {
+	function menukeyboard2() {
 		menu_log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equals( $("#log").html(), "1,keydown,", "Keydown LEFT (close submenu)");
 
 		//re-open submenu
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+		setTimeout( menukeyboard3, 50 );
+	}
 
-		setTimeout( function() {
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-			equals( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
-
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-			equals( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
+	function menukeyboard3() {
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equals( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-			equals( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+		equals( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-			equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equals( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-			equals( $("#log").html(), "27,keydown,", "Keydown END");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+		equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-			equals( $("#log").html(), "0,keydown,", "Keydown HOME");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+		equals( $("#log").html(), "27,keydown,", "Keydown END");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-			equals( $("#log").html(), "1,keydown,", "Keydown ESCAPE (close submenu)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+		equals( $("#log").html(), "0,keydown,", "Keydown HOME");
 
-			menu_log("keydown",true);
-			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equals( $("#log").html(), "1,keydown,", "Keydown ESCAPE (close submenu)");
 
-			setTimeout( function() {
-				equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		setTimeout( menukeyboard4, 50 );
+	}
 
-				menu_log("keydown",true);
-				element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-				equals( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER (select item)");
+	function menukeyboard4() {
+		equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
 
-				start();
-			}, 200);
-		}, 150);
-	}, 100);
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equals( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER (select item)");
 
+		start();
+	}
 });
 
 })(jQuery);