Merge branch 'master' into selectmenu

1 files changed, 7 insertions, 7 deletions

diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html
index 6229d47b2..38c75e157 100644
--- a/demos/autocomplete/combobox.html
+++ b/demos/autocomplete/combobox.html
@@ -39,6 +39,7 @@
 			_create: function() {
 				var input,
 					that = this,
+					wasOpen = false,
 					select = this.element.hide(),
 					selected = select.children( ":selected" ),
 					value = selected.val() ? selected.text() : "",
@@ -129,20 +130,19 @@
 					})
 					.removeClass( "ui-corner-all" )
 					.addClass( "ui-corner-right ui-combobox-toggle" )
+					.mousedown(function() {
+						wasOpen = input.autocomplete( "widget" ).is( ":visible" );
+					})
 					.click(function() {
+						input.focus();
+
 						// close if already visible
-						if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
-							input.autocomplete( "close" );
-							removeIfInvalid( input );
+						if ( wasOpen ) {
 							return;
 						}
 
-						// work around a bug (likely same cause as #5265)
-						$( this ).blur();
-
 						// pass empty string as value to search for, displaying all results
 						input.autocomplete( "search", "" );
-						input.focus();
 					});
 
 				input.tooltip({