Autocomplete: Cleanup

Author: scottgonzalez

tests/unit/autocomplete/autocomplete_events.js

@@ -140,22 +140,25 @@ asyncTest( "cancel focus", function() {
 	}, 50 );
 });
 
-asyncTest( "past end of menu contenteditable", function() {
-	expect( 1 );
+asyncTest( "past end of menu in multiline autocomplete", function() {
+	expect( 2 );
+
 	var customVal = "custom value",
 		element = $( "#autocomplete-contenteditable" ).autocomplete({
 			delay: 0,
-			source: data,
-			focus: function() {
+			source: [ "javascript" ],
+			focus: function( event, ui ) {
+				equal( ui.item.value, "javascript", "Item gained focus" );
 				$( this ).text( customVal );
-				return false;
+				event.preventDefault();
 			}
 		});
 
-	element.simulate( "focus" ).text( "ja" ).keydown();
+	element
+		.simulate( "focus" )
+		.autocomplete( "search", "ja" );
 
 	setTimeout(function() {
-		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		equal( element.text(), customVal );

ui/autocomplete.js

@@ -546,9 +546,9 @@ $.widget( "ui.autocomplete", {
 		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
 				this.menu.isLastItem() && /^next/.test( direction ) ) {
 
-			if ( ! this.isMultiLine ) {
-                                this._value( this.term );
-                        }
+			if ( !this.isMultiLine ) {
+				this._value( this.term );
+			}
 
 			this.menu.blur();
 			return;