From 770924ca8d82f13839964df18734f4168819e122 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Sun, 9 Sep 2012 19:06:14 -0700 Subject: [PATCH 1/2] Fix empty Select2 input from throwing an error when attempting to selecting a value. --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 44d0e924fa..0840fb902d 100755 --- a/select2.js +++ b/select2.js @@ -2361,7 +2361,7 @@ return markup.join(""); }, formatSelection: function (data, container) { - return data.text; + return data ? data.text : undefined; }, formatResultCssClass: function(data) {return undefined;}, formatNoMatches: function () { return "No matches found"; }, From 7be0e509ffa167f50fbcd426a7a6c59a947e98db Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Sun, 9 Sep 2012 19:35:34 -0700 Subject: [PATCH 2/2] Remove references to `jQuery.Events`, replace with the closure dollar variable. --- select2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2.js b/select2.js index 0840fb902d..e2e2191c61 100755 --- a/select2.js +++ b/select2.js @@ -926,7 +926,7 @@ if (this.opened()) return false; - event = jQuery.Event("open"); + event = $.Event("open"); this.opts.element.trigger(event); return !event.isDefaultPrevented(); }, @@ -1020,7 +1020,7 @@ this.results.empty(); this.clearSearch(); - this.opts.element.trigger(jQuery.Event("close")); + this.opts.element.trigger($.Event("close")); }, // abstract