Merge pull request select2#2702 from dgroux/master

kevin-brown · kevin-brown · commit c1df0aa942ea · 2014-10-08T21:12:01.000-04:00
allow formatSelection to return a jQuery object
diff --git a/select2.js b/select2.js
@@ -3058,7 +3058,7 @@ the specific language governing permissions and limitations under the Apache Lic
 
             formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
             if (formatted != undefined) {
-                choice.find("div").replaceWith("<div>"+formatted+"</div>");
+                choice.find("div").replaceWith($("<div></div>").html(formatted));
             }
             cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
             if (cssClass != undefined) {

Original file line number	Diff line number	Diff line change
`@@ -3058,7 +3058,7 @@ the specific language governing permissions and limitations under the Apache Lic`
`3058`	`3058`
`3059`	`3059`	`formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);`
`3060`	`3060`	`if (formatted != undefined) {`
`3061`		`- choice.find("div").replaceWith("<div>"+formatted+"</div>");`
	`3061`	`+ choice.find("div").replaceWith($("<div></div>").html(formatted));`
`3062`	`3062`	`}`
`3063`	`3063`	`cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));`
`3064`	`3064`	`if (cssClass != undefined) {`