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

imrpove handling of objects in tags helper. closes #50

Browse Source
This commit is contained in:
Igor Vaynberg 2012-04-27 11:40:32 -07:00
parent ee6f8975a6
commit 11b0a1662c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
select2.js
View File

@ -286,6 +286,8 @@
// TODO javadoc
function tags(data) {
// TODO even for a function we should probably return a wrapper that does the same object/string check as
// the function for arrays. otherwise only functions that return objects are supported.
if ($.isFunction(data)) {
return data;
}
@ -295,7 +297,12 @@
return function (query) {
var t = query.term.toUpperCase(), filtered = {results: []};
$(data).each(function () {
if (t === "" || this.toUpperCase().indexOf(t) >= 0) { filtered.results.push({id: this, text: this}); }
console.log(this);
var isObject = "text" in this,
text = isObject ? this.text : this;
if (t === "" || text.toUpperCase().indexOf(t) >= 0) {
filtered.results.push(isObject ? this : {id: this, text: this});
}
});
query.callback(filtered);
};
@ -1061,7 +1068,6 @@
// TODO validate placeholder is a string if specified
if (opts.element.get(0).tagName.toLowerCase() === "select") {
// install sthe selection initializer
opts.initSelection = function (element) {
@ -1230,7 +1236,6 @@
this.addSelectedChoice(data);
if (this.select) { this.postprocessResults(); }
if (this.opts.closeOnSelect) {
this.close();
this.search.width(10);