RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 21:16:10 +03:00
Code Issues Projects Releases Wiki Activity

make escapeMarkup optional

Browse Source 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
This commit is contained in:
Sławek Ehlert 2012-08-26 15:19:49 +02:00 committed by Igor Vaynberg
parent 3b55a65c4d
commit 852a515d04
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
select2.js
View File

@ -92,14 +92,6 @@
nextUid=(function() { var counter=1; return function() { return counter++; }; }());
function escapeMarkup(markup) {
if (markup && typeof(markup) === "string") {
return markup.replace(/&/g, "&amp;");
} else {
return markup;
}
}
function indexOf(value, array) {
var i = 0, l = array.length, v;
@ -710,7 +702,7 @@
formatted=opts.formatResult(result, label, query);
if (formatted!==undefined) {
label.html(escapeMarkup(formatted));
label.html(self.escapeMarkup(formatted));
}
node.append(label);
@ -809,6 +801,15 @@
return opts;
},
escapeMarkup: function (markup) {
if (this.opts.doEscapeMarkup) {
if (markup && typeof(markup) === "string") {
return markup.replace(/&/g, "&amp;");
}
}
return markup;
},
/**
* Monitor the original element for changes and update select2 accordingly
*/
@ -1180,7 +1181,7 @@
}
function render(html) {
results.html(escapeMarkup(html));
results.html(self.escapeMarkup(html));
postRender();
}
@ -1243,7 +1244,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'>" + escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
results.append("<li class='select2-more-results'>" + self.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
}
@ -1627,7 +1628,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(escapeMarkup(placeholder));
this.selection.find("span").html(this.escapeMarkup(placeholder));
this.selection.addClass("select2-default");
@ -1686,7 +1687,7 @@
container.empty();
formatted=this.opts.formatSelection(data, container);
if (formatted !== undefined) {
container.append(escapeMarkup(formatted));
container.append(this.escapeMarkup(formatted));
}
this.selection.removeClass("select2-default");
@ -2063,7 +2064,8 @@
formatted;
formatted=this.opts.formatSelection(data, choice);
choice.find("div").replaceWith("<div>"+escapeMarkup(formatted)+"</div>");
console.log(" 7 " + this.escapeMarkup);
choice.find("div").replaceWith("<div>"+this.escapeMarkup(formatted)+"</div>");
choice.find(".select2-search-choice-close")
.bind("mousedown", killEvent)
.bind("click dblclick", this.bind(function (e) {
@ -2338,6 +2340,7 @@
closeOnSelect: true,
openOnEnter: true,
containerCss: {},
doEscapeMarkup: true,
dropdownCss: {},
containerCssClass: "",
dropdownCssClass: "",