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

allow data helper to be a function

Browse Source
This commit is contained in:
Igor Vaynberg 2013-02-14 19:52:43 -08:00
parent 76cd145380
commit 7d908da52f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
select2.js
View File

@ -403,6 +403,7 @@ the specific language governing permissions and limitations under the Apache Lic
function local(options) { function local(options) {
var data = options, // data elements var data = options, // data elements
dataText, dataText,
tmp,
text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
if (!$.isArray(data)) { if (!$.isArray(data)) {
@ -412,13 +413,22 @@ the specific language governing permissions and limitations under the Apache Lic
dataText = data.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available dataText = data.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
text = function (item) { return item[dataText]; }; text = function (item) { return item[dataText]; };
} }
data = data.results; }
if ($.isArray(data)) {
tmp = data;
data = {results:tmp};
}
if ($.isFunction(data) === false) {
tmp = data;
data = function() { return tmp; };
} }
return function (query) { return function (query) {
var t = query.term, filtered = { results: [] }, process; var t = query.term, filtered = { results: [] }, process;
if (t === "") { if (t === "") {
query.callback({results: data}); query.callback(data());
return; return;
} }
@ -442,7 +452,7 @@ the specific language governing permissions and limitations under the Apache Lic
} }
}; };
$(data).each2(function(i, datum) { process(datum, filtered.results); }); $(data()).each2(function(i, datum) { process(datum, filtered.results); });
query.callback(filtered); query.callback(filtered);
}; };
} }
@ -1384,6 +1394,7 @@ the specific language governing permissions and limitations under the Apache Lic
} }
this.resultsPage = 1; this.resultsPage = 1;
opts.query({ opts.query({
element: opts.element, element: opts.element,
term: search.val(), term: search.val(),
@ -1398,7 +1409,6 @@ the specific language governing permissions and limitations under the Apache Lic
// save context, if any // save context, if any
this.context = (data.context===undefined) ? null : data.context; this.context = (data.context===undefined) ? null : data.context;
// create a default choice and prepend it to the list // create a default choice and prepend it to the list
if (this.opts.createSearchChoice && search.val() !== "") { if (this.opts.createSearchChoice && search.val() !== "") {
def = this.opts.createSearchChoice.call(null, search.val(), data.results); def = this.opts.createSearchChoice.call(null, search.val(), data.results);