RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-16 20:13:16 +03:00
Code Issues Projects Releases Wiki Activity

Revert "changes on updateResults, populate by @cervengoc on #781"

Browse Source 
This reverts commit 12e0de21ae4d753eee3950be9b95848a82df6f15.
This commit is contained in:
ycdtosa 2014-05-13 09:54:00 +02:00
parent 12e0de21ae
commit c14f45cb6c
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
select2.js
View File

@ -919,46 +919,39 @@ the specific language governing permissions and limitations under the Apache Lic
populate=function(results, container, depth) {
var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted, formattedClass;
var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
results = opts.sortResults(results, container, query);
// collect the created nodes for bulk append
var nodes = [];
for (i = 0, l = results.length; i < l; i = i + 1) {
result=results[i];
disabled = (result.disabled === true);
selectable = (!disabled) && (id(result) !== undefined);
compound=result.children && result.children.length > 0;
node ="<li class=\"";
node += "select2-results-dept-" + depth;
node += " select2-result";
node+= selectable ? " select2-result-selectable" : " select2-result-unselectable";
if (disabled)
node += " select2-disabled";
if (compound)
node += " select2-result-with-children";
formattedClass = self.opts.formatResultCssClass(result);
if (formattedClass != undefined)
node += " " + formattedClass;
node += "\" role=\"presentation\">";
node=$("<li></li>");
node.addClass("select2-results-dept-"+depth);
node.addClass("select2-result");
node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
if (disabled) { node.addClass("select2-disabled"); }
if (compound) { node.addClass("select2-result-with-children"); }
node.addClass(self.opts.formatResultCssClass(result));
node.attr("role", "presentation");
label = "<div class=\"select2-result-label\"";
label += " id=\"select2-result-label-" + nextUid() + "\"";
label += " role=\"option\"";
label += ">";
formatted = opts.formatResult(result, label, query, self.opts.escapeMarkup);
if (formatted !== undefined)
label += formatted;
label += "</div>";
label=$(document.createElement("div"));
label.addClass("select2-result-label");
label.attr("id", "select2-result-label-" + nextUid());
label.attr("role", "option");
node += label;
node += "</li>";
formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
if (formatted!==undefined) {
label.html(formatted);
node.append(label);
}
// I still used jQuery wrapping for setting "data" below
node = $(node);
if (compound) {
@ -969,10 +962,9 @@ the specific language governing permissions and limitations under the Apache Lic
}
node.data("select2-data", result);
nodes.push(node[0]);
container.append(node);
}
// bulk append the created nodes
container.append(nodes);
liveRegion.text(opts.formatMatches(results.length));
};