Skip to content

Commit 95b89d4

Browse files
committed
use opts.id func to check for id instead of hardcoded id key
1 parent 45442aa commit 95b89d4

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

select2.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,15 +536,15 @@
536536
containerCssClass: "",
537537
dropdownCssClass: "",
538538
populateResults: function(container, results, query) {
539-
var uidToData={}, populate, markup=[], uid, data, result, children, formatted;
539+
var uidToData={}, populate, markup=[], uid, data, result, children, formatted, id=this.opts.id;
540540

541541
populate=function(results, depth) {
542542

543543
var i, l, uid, result, selectable, compound;
544544
for (i = 0, l = results.length; i < l; i = i + 1) {
545545

546546
result=results[i];
547-
selectable=("id" in result); // TODO switch to id() function
547+
selectable=id(result) !== undefined;
548548
compound=("children" in result) && result.children.length > 0;
549549

550550
markup.push("<li class='select2-result-depth-"+depth);
@@ -878,7 +878,7 @@
878878
matcher: this.opts.matcher,
879879
callback: this.bind(function (data) {
880880

881-
self.opts.populateResults(results, data.results, {term: term, page: page, context:context});
881+
self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
882882

883883
if (data.more===true) {
884884
more.detach();
@@ -952,7 +952,7 @@
952952
}
953953

954954
results.empty();
955-
self.opts.populateResults(results, data.results, {term: search.val(), page: this.resultsPage, context:null});
955+
self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
956956
postRender();
957957

958958
if (data.more === true) {

0 commit comments

Comments
 (0)