Merge pull request #397 from kchung/master

Prevent formatSelection for erroring when accessing an empty select input.
select2 · Sep 10, 2012 · c0ce4be · c0ce4be
2 parents 819cca7 + 7be0e50
commit c0ce4be
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
@@ -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"; },