RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-30 00:26:03 +03:00
Code Issues Projects Releases Wiki Activity

move markup escaping of selection into the formatSelection callback. fixes #1417. fixes #1420

Browse Source
This commit is contained in:
Igor Vaynberg 2013-06-23 14:32:45 -07:00
parent 1415567a70
commit ef136731d4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
select2.js
View File

@ -2174,9 +2174,9 @@ the specific language governing permissions and limitations under the Apache Lic
this.selection.data("select2-data", data); this.selection.data("select2-data", data);
container.empty(); container.empty();
formatted=this.opts.formatSelection(data, container); formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
if (formatted !== undefined) { if (formatted !== undefined) {
container.append(this.opts.escapeMarkup(formatted)); container.append(formatted);
} }
cssClass=this.opts.formatSelectionCssClass(data, container); cssClass=this.opts.formatSelectionCssClass(data, container);
if (cssClass !== undefined) { if (cssClass !== undefined) {
@ -2722,9 +2722,9 @@ the specific language governing permissions and limitations under the Apache Lic
formatted, formatted,
cssClass; cssClass;
formatted=this.opts.formatSelection(data, choice.find("div")); formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
if (formatted != undefined) { if (formatted != undefined) {
choice.find("div").replaceWith("<div>"+this.opts.escapeMarkup(formatted)+"</div>"); choice.find("div").replaceWith("<div>"+formatted+"</div>");
} }
cssClass=this.opts.formatSelectionCssClass(data, choice.find("div")); cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
if (cssClass != undefined) { if (cssClass != undefined) {
@ -3085,8 +3085,8 @@ the specific language governing permissions and limitations under the Apache Lic
markMatch(result.text, query.term, markup, escapeMarkup); markMatch(result.text, query.term, markup, escapeMarkup);
return markup.join(""); return markup.join("");
}, },
formatSelection: function (data, container) { formatSelection: function (data, container, escapeMarkup) {
return data ? data.text : undefined; return data ? escapeMarkup(data.text) : undefined;
}, },
sortResults: function (results, container, query) { sortResults: function (results, container, query) {
return results; return results;