Autocomplete: ESCAPE should not change content of a MultiLine

Fixes #9790
Closes gh-1190

2 files changed, 31 insertions, 1 deletions

diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js
index c306495f2..e8a3e5937 100644
--- a/tests/unit/autocomplete/autocomplete_core.js
+++ b/tests/unit/autocomplete/autocomplete_core.js
@@ -189,6 +189,34 @@ asyncTest( "past end of menu in multiline autocomplete", function() {
 	}, 50 );
 });
 
+asyncTest( "ESCAPE in multiline autocomplete", function() {
+        expect( 2 );
+
+        var customVal = "custom value",
+                element = $( "#autocomplete-contenteditable" ).autocomplete({
+                        delay: 0,
+                        source: [ "javascript" ],
+                        focus: function( event, ui ) {
+                                equal( ui.item.value, "javascript", "Item gained focus" );
+                                $( this ).text( customVal );
+                                event.preventDefault();
+                        }
+                });
+
+        element
+                .simulate( "focus" )
+                .autocomplete( "search", "ja" );
+
+        setTimeout(function() {
+                element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+                element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+                equal( element.text(), customVal );
+                start();
+        }, 50 );
+});
+
+
+
 asyncTest( "handle race condition", function() {
 	expect( 3 );
 	var count = 0,
diff --git a/ui/autocomplete.js b/ui/autocomplete.js
index d53a1d5e3..3f428ea3d 100644
--- a/ui/autocomplete.js
+++ b/ui/autocomplete.js
@@ -130,7 +130,9 @@ $.widget( "ui.autocomplete", {
 					break;
 				case keyCode.ESCAPE:
 					if ( this.menu.element.is( ":visible" ) ) {
-						this._value( this.term );
+						if ( !this.isMultiLine ) {
+							this._value( this.term );
+						}
 						this.close( event );
 						// Different browsers have different default behavior for escape
 						// Single press can mean undo or clear