Properly clean-up deselected trigger when updating field. (Closes har…

…vesthq#603)
gil · May 3, 2012 · 9c5ecab · 9c5ecab
1 parent 683efa7
commit 9c5ecab
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/chosen/chosen.jquery.js b/chosen/chosen.jquery.js
@@ -188,6 +188,7 @@ Copyright (c) 2011 by Harvest
     };
 
     AbstractChosen.prototype.results_update_field = function() {
+      this.results_reset();
       this.result_clear_highlight();
       this.result_single_selected = null;
       return this.results_build();
@@ -692,12 +693,12 @@ Copyright (c) 2011 by Harvest
       return link.parents('li').first().remove();
     };
 
-    Chosen.prototype.results_reset = function(evt) {
+    Chosen.prototype.results_reset = function() {
       this.form_field.options[0].selected = true;
       this.selected_item.find("span").text(this.default_text);
       if (!this.is_multiple) this.selected_item.addClass("chzn-default");
       this.show_search_field_default();
-      $(evt.target).remove();
+      this.selected_item.find("abbr").remove();
       this.form_field_jq.trigger("change");
       if (this.active_field) return this.results_hide();
     };

diff --git a/chosen/chosen.jquery.min.js b/chosen/chosen.jquery.min.js
diff --git a/chosen/chosen.proto.js b/chosen/chosen.proto.js
@@ -188,6 +188,7 @@ Copyright (c) 2011 by Harvest
     };
 
     AbstractChosen.prototype.results_update_field = function() {
+      this.results_reset();
       this.result_clear_highlight();
       this.result_single_selected = null;
       return this.results_build();
@@ -684,12 +685,12 @@ Copyright (c) 2011 by Harvest
       return link.up('li').remove();
     };
 
-    Chosen.prototype.results_reset = function(evt) {
+    Chosen.prototype.results_reset = function() {
       this.form_field.options[0].selected = true;
       this.selected_item.down("span").update(this.default_text);
       if (!this.is_multiple) this.selected_item.addClassName("chzn-default");
       this.show_search_field_default();
-      evt.target.remove();
+      this.selected_item.down("abbr").remove();
       if (typeof Event.simulate === 'function') this.form_field.simulate("change");
       if (this.active_field) return this.results_hide();
     };

diff --git a/chosen/chosen.proto.min.js b/chosen/chosen.proto.min.js
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -319,12 +319,12 @@ class Chosen extends AbstractChosen
     this.result_deselect (link.attr "rel")
     link.parents('li').first().remove()
 
-  results_reset: (evt) ->
+  results_reset: ->
     @form_field.options[0].selected = true
     @selected_item.find("span").text @default_text
     @selected_item.addClass("chzn-default") if not @is_multiple
     this.show_search_field_default()
-    $(evt.target).remove();
+    @selected_item.find("abbr").remove()
     @form_field_jq.trigger "change"
     this.results_hide() if @active_field
 

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -311,12 +311,12 @@ class Chosen extends AbstractChosen
     this.result_deselect link.readAttribute("rel")
     link.up('li').remove()
 
-  results_reset: (evt) ->
+  results_reset: ->
     @form_field.options[0].selected = true
     @selected_item.down("span").update(@default_text)
     @selected_item.addClassName("chzn-default") if not @is_multiple
     this.show_search_field_default()
-    evt.target.remove()
+    @selected_item.down("abbr").remove()
     @form_field.simulate("change") if typeof Event.simulate is 'function'
     this.results_hide() if @active_field
 

diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee
@@ -70,6 +70,7 @@ class AbstractChosen
       ""
 
   results_update_field: ->
+    this.results_reset()
     this.result_clear_highlight()
     @result_single_selected = null
     this.results_build()