Allow labels to be jQuery objects as well as plain strings, for increased flexibility

Bob Leers · Bob Leers · commit 816b89f76142 · 2013-03-07T12:07:21.000+01:00
diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js
@@ -248,6 +248,28 @@ test( "source, custom", function() {
 	});
 });
 
+test( "custom source with jQuery label object", function() {
+	expect( 4 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: function( request, response ) {
+			  equal( request.term, "er" );
+			  response([
+			    { label: $("<strong>er</strong><span>lang</span>"), value: "erlang" },
+			    { label: $("<span>p</span><strong>er</strong><span>l</span>"), value: "perl" },
+			    // Intentional string, must not be interpreted as HTML
+			    { label: "<span>ob</span><strong>er</strong><span>on</span>", value: "oberon" }
+			  ]);
+			}
+		});
+	element.val( "er" ).autocomplete( "search" );
+	var menu = $( "#autocomplete" ).autocomplete( "widget" ),
+	    perl = menu.find( ".ui-menu-item span+strong+span" ),
+	    oberon = menu.find( ".ui-menu-item:last-child" );
+	equal( perl.length, 1 );
+	equal( perl.parent().text(), "perl" );
+	equal( oberon.text(), "<span>ob</span><strong>er</strong><span>on</span>" );
+});
+
 test( "source, update after init", function() {
 	expect( 2 );
 	var element = $( "#autocomplete" ).autocomplete({
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
@@ -529,7 +529,7 @@ $.widget( "ui.autocomplete", {
 
 	_renderItem: function( ul, item ) {
 		return $( "<li>" )
-			.append( $( "<a>" ).text( item.label ) )
+			.append( $( "<a>" )[item.label instanceof $ ? 'append' : 'text']( item.label ) )
 			.appendTo( ul );
 	},
 
