From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Wed, 11 May 2011 11:19:46 +0000 (+0200)
Subject: Autocomplete: Revert fix for #7024, broke regular menu selection.
X-Git-Tag: 1.9m5~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c17f245d9848ae865d400dabb02ea954aa8da645;p=jquery-ui.git

Autocomplete: Revert fix for #7024, broke regular menu selection.
Disabled test for now (need to reopen ticket).
---

diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index eb009064c..c884733d6 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -203,6 +203,7 @@ test("cancel select", function() {
 	}, 50);
 });
 
+/* TODO previous fix broke more than it fixed, disabling this for now - messed up regular menu select event
 test("blur without selection", function() {
 	expect(1);
 	var ac = $("#autocomplete").autocomplete({
@@ -218,5 +219,6 @@ test("blur without selection", function() {
 		start();
 	}, 50);
 });
+*/
 
 })(jQuery);
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index b3d7598c1..0e62ccfdb 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -365,7 +365,6 @@ $.widget( "ui.autocomplete", {
 			this.menu.element.hide();
 			this.menu.blur();
 			this._trigger( "close", event );
-			this.menu.isNewMenu = true;
 		}
 	},
 	
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 3cc25062c..0841018af 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -18,7 +18,6 @@ var idIncrement = 0;
 $.widget("ui.menu", {
 	defaultElement: "<ul>",
 	delay: 150,
-	isNewMenu: true,
 	options: {
 		position: {
 			my: "left top",
@@ -55,8 +54,7 @@ $.widget("ui.menu", {
 				self.select( event );
 			})
 			.bind( "mouseover.menu", function( event ) {
-				if ( self.options.disabled || self.isNewMenu ) {
-					self.isNewMenu = false;
+				if ( self.options.disabled ) {
 					return;
 				}
 				var target = $( event.target ).closest( ".ui-menu-item" );