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

Merge pull request #964 from adam-iris/master

Browse Source 
Fix for issue #934
This commit is contained in:
Igor Vaynberg 2013-03-01 10:47:40 -08:00
commit 66860b2811
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
select2.js
View File

@ -1812,13 +1812,18 @@ the specific language governing permissions and limitations under the Apache Lic
// install default initSelection when applied to hidden input and data is local // install default initSelection when applied to hidden input and data is local
opts.initSelection = opts.initSelection || function (element, callback) { opts.initSelection = opts.initSelection || function (element, callback) {
var id = element.val(); var id = element.val();
//search in data by id //search in data by id, storing the actual matching item
var match = null;
opts.query({ opts.query({
matcher: function(term, text, el){ matcher: function(term, text, el){
return equal(id, opts.id(el)); var is_match = equal(id, opts.id(el));
if (is_match) {
match = el;
}
return is_match;
}, },
callback: !$.isFunction(callback) ? $.noop : function(filtered) { callback: !$.isFunction(callback) ? $.noop : function() {
callback(filtered.results.length ? filtered.results[0] : null); callback(match);
} }
}); });
}; };
@ -2045,15 +2050,20 @@ the specific language governing permissions and limitations under the Apache Lic
// install default initSelection when applied to hidden input and data is local // install default initSelection when applied to hidden input and data is local
opts.initSelection = opts.initSelection || function (element, callback) { opts.initSelection = opts.initSelection || function (element, callback) {
var ids = splitVal(element.val(), opts.separator); var ids = splitVal(element.val(), opts.separator);
//search in data by array of ids //search in data by array of ids, storing matching items in a list
var matches = [];
opts.query({ opts.query({
matcher: function(term, text, el){ matcher: function(term, text, el){
return $.grep(ids, function(id) { var is_match = $.grep(ids, function(id) {
return equal(id, opts.id(el)); return equal(id, opts.id(el));
}).length; }).length;
if (is_match) {
matches.push(el);
}
return is_match;
}, },
callback: !$.isFunction(callback) ? $.noop : function(filtered) { callback: !$.isFunction(callback) ? $.noop : function() {
callback(filtered.results); callback(matches);
} }
}); });
}; };