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

Merge pull request #397 from kchung/master

Browse Source 
Prevent formatSelection for erroring when accessing an empty select input.
This commit is contained in:
Igor Vaynberg 2012-09-10 08:47:53 -07:00
commit c0ce4be801
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
select2.js
View File

@ -926,7 +926,7 @@
if (this.opened()) return false; if (this.opened()) return false;
event = jQuery.Event("open"); event = $.Event("open");
this.opts.element.trigger(event); this.opts.element.trigger(event);
return !event.isDefaultPrevented(); return !event.isDefaultPrevented();
}, },
@ -1020,7 +1020,7 @@
this.results.empty(); this.results.empty();
this.clearSearch(); this.clearSearch();
this.opts.element.trigger(jQuery.Event("close")); this.opts.element.trigger($.Event("close"));
}, },
// abstract // abstract
@ -2361,7 +2361,7 @@
return markup.join(""); return markup.join("");
}, },
formatSelection: function (data, container) { formatSelection: function (data, container) {
return data.text; return data ? data.text : undefined;
}, },
formatResultCssClass: function(data) {return undefined;}, formatResultCssClass: function(data) {return undefined;},
formatNoMatches: function () { return "No matches found"; }, formatNoMatches: function () { return "No matches found"; },