Fix merge conflicts caused by min version

harvesthq · Aug 16, 2011 · 1d6df98 · 1d6df98 · wjcrowcroft · Aug 17, 2011
1 parent 57fcc57
commit 1d6df98
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/chosen/chosen.jquery.js b/chosen/chosen.jquery.js
@@ -95,17 +95,17 @@
       return this.set_tab_index();
     };
     Chosen.prototype.register_observers = function() {
-      this.container.click(__bind(function(evt) {
-        return this.container_click(evt);
+      this.container.mousedown(__bind(function(evt) {
+        return this.container_mousedown(evt);
       }, this));
       this.container.mouseenter(__bind(function(evt) {
         return this.mouse_enter(evt);
       }, this));
       this.container.mouseleave(__bind(function(evt) {
         return this.mouse_leave(evt);
       }, this));
-      this.search_results.click(__bind(function(evt) {
-        return this.search_results_click(evt);
+      this.search_results.mouseup(__bind(function(evt) {
+        return this.search_results_mouseup(evt);
       }, this));
       this.search_results.mouseover(__bind(function(evt) {
         return this.search_results_mouseover(evt);
@@ -138,8 +138,8 @@
         }, this));
       }
     };
-    Chosen.prototype.container_click = function(evt) {
-      if (evt && evt.type === "click") {
+    Chosen.prototype.container_mousedown = function(evt) {
+      if (evt && evt.type === "mousedown") {
         evt.stopPropagation();
       }
       if (!this.pending_destroy_click) {
@@ -167,7 +167,7 @@
     Chosen.prototype.input_focus = function(evt) {
       if (!this.active_field) {
         return setTimeout((__bind(function() {
-          return this.container_click();
+          return this.container_mousedown();
         }, this)), 50);
       }
     };
@@ -356,7 +356,7 @@
         return this.search_field.removeClass("default");
       }
     };
-    Chosen.prototype.search_results_click = function(evt) {
+    Chosen.prototype.search_results_mouseup = function(evt) {
       var target;
       target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
       if (target.length) {