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

make escapeMarkup configurable. closes #355

Browse Source
This commit is contained in:
Igor Vaynberg 2012-08-27 09:48:02 -07:00
parent 55cc11f9b7
commit 7baa3b9e93
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
select2.js
View File

@ -702,7 +702,7 @@
formatted=opts.formatResult(result, label, query);
if (formatted!==undefined) {
label.html(self.escapeMarkup(formatted));
label.html(self.opts.escapeMarkup(formatted));
}
node.append(label);
@ -801,15 +801,6 @@
return opts;
},
escapeMarkup: function (markup) {
if (this.opts.doEscapeMarkup) {
if (markup && typeof(markup) === "string") {
return markup.replace(/&/g, "&");
}
}
return markup;
},
/**
* Monitor the original element for changes and update select2 accordingly
*/
@ -1181,7 +1172,7 @@
}
function render(html) {
results.html(self.escapeMarkup(html));
results.html(self.opts.escapeMarkup(html));
postRender();
}
@ -1244,7 +1235,7 @@
self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
results.append("<li class='select2-more-results'>" + self.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
results.append("<li class='select2-more-results'>" + self.opts.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
}
@ -1628,7 +1619,7 @@
// check for a first blank option if attached to a select
if (this.select && this.select.find("option:first").text() !== "") return;
this.selection.find("span").html(this.escapeMarkup(placeholder));
this.selection.find("span").html(this.opts.escapeMarkup(placeholder));
this.selection.addClass("select2-default");
@ -1687,7 +1678,7 @@
container.empty();
formatted=this.opts.formatSelection(data, container);
if (formatted !== undefined) {
container.append(this.escapeMarkup(formatted));
container.append(this.opts.escapeMarkup(formatted));
}
this.selection.removeClass("select2-default");
@ -2064,7 +2055,7 @@
formatted;
formatted=this.opts.formatSelection(data, choice);
choice.find("div").replaceWith("<div>"+this.escapeMarkup(formatted)+"</div>");
choice.find("div").replaceWith("<div>"+this.opts.escapeMarkup(formatted)+"</div>");
choice.find(".select2-search-choice-close")
.bind("mousedown", killEvent)
.bind("click dblclick", this.bind(function (e) {
@ -2339,7 +2330,6 @@
closeOnSelect: true,
openOnEnter: true,
containerCss: {},
doEscapeMarkup: true,
dropdownCss: {},
containerCssClass: "",
dropdownCssClass: "",
@ -2366,7 +2356,13 @@
},
separator: ",",
tokenSeparators: [],
tokenizer: defaultTokenizer
tokenizer: defaultTokenizer,
escapeMarkup: function (markup) {
if (markup && typeof(markup) === "string") {
return markup.replace(/&/g, "&amp;");
}
return markup;
}
};
// exports