From 9dcd0e0eb824a4000692b6ce6d864056339ac498 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Tue, 22 May 2012 16:01:40 +0200
Subject: [PATCH] Menu: Handle SPACE same as ENTER, select items or opening
 submenus

---
 tests/unit/menu/menu_events.js | 16 ++++++++++++++--
 ui/jquery.ui.menu.js           | 22 +++++++++++++++-------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 4cb083240..643da4a26 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -208,7 +208,7 @@ test("handle keyboard navigation on menu without scroll and without submenus", f
 });
 
 asyncTest("handle keyboard navigation on menu without scroll and with submenus", function() {
-	expect(14);
+	expect(16);
 	var element = $('#menu2').menu({
 		select: function(event, ui) {
 			log($(ui.item[0]).text());
@@ -290,11 +290,23 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 		equal( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
 
 		log("keydown",true);
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.SPACE } );
 		setTimeout( menukeyboard4, 50 );
 	}
 
 	function menukeyboard4() {
+		equal( $("#log").html(), "0,keydown,", "Keydown SPACE (open submenu)");
+
+		log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+		equal( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
+
+		log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		setTimeout( menukeyboard5, 50 );
+	}
+
+	function menukeyboard5() {
 		equal( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
 
 		log("keydown",true);
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index d3c32e3a0..1bfd76716 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -202,13 +202,11 @@ $.widget( "ui.menu", {
 			event.preventDefault();
 			break;
 		case $.ui.keyCode.ENTER:
-			if ( !this.active.is( ".ui-state-disabled" ) ) {
-				if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
-					this.expand( event );
-				} else {
-					this.select( event );
-				}
-			}
+			this._activate( event );
+			event.preventDefault();
+			break;
+		case $.ui.keyCode.SPACE:
+			this._activate( event );
 			event.preventDefault();
 			break;
 		case $.ui.keyCode.ESCAPE:
@@ -260,6 +258,16 @@ $.widget( "ui.menu", {
 		}
 	},
 
+	_activate: function( event ) {
+		if ( !this.active.is( ".ui-state-disabled" ) ) {
+			if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
+				this.expand( event );
+			} else {
+				this.select( event );
+			}
+		}
+	},
+
 	refresh: function() {
 		// initialize nested menus
 		var menus,
-- 
2.39.5