Only clean up the deselect trigger for single selects (and don't call…

… the rest of results_reset)

Fixes harvesthq#603, harvesthq#607, harvesthq#608, harvesthq#609, harvesthq#610

chosen/chosen.jquery.js

@@ -188,7 +188,7 @@ Copyright (c) 2011 by Harvest
     };
 
     AbstractChosen.prototype.results_update_field = function() {
-      this.results_reset();
+      if (!this.is_multiple) this.results_reset_cleanup();
       this.result_clear_highlight();
       this.result_single_selected = null;
       return this.results_build();
@@ -698,11 +698,15 @@ Copyright (c) 2011 by Harvest
       this.selected_item.find("span").text(this.default_text);
       if (!this.is_multiple) this.selected_item.addClass("chzn-default");
       this.show_search_field_default();
-      this.selected_item.find("abbr").remove();
+      this.results_reset_cleanup();
       this.form_field_jq.trigger("change");
       if (this.active_field) return this.results_hide();
     };
 
+    Chosen.prototype.results_reset_cleanup = function() {
+      return this.selected_item.find("abbr").remove();
+    };
+
     Chosen.prototype.result_select = function(evt) {
       var high, high_id, item, position;
       if (this.result_highlight) {

chosen/chosen.proto.js

@@ -188,7 +188,7 @@ Copyright (c) 2011 by Harvest
     };
 
     AbstractChosen.prototype.results_update_field = function() {
-      this.results_reset();
+      if (!this.is_multiple) this.results_reset_cleanup();
       this.result_clear_highlight();
       this.result_single_selected = null;
       return this.results_build();
@@ -690,11 +690,17 @@ Copyright (c) 2011 by Harvest
       this.selected_item.down("span").update(this.default_text);
       if (!this.is_multiple) this.selected_item.addClassName("chzn-default");
       this.show_search_field_default();
-      this.selected_item.down("abbr").remove();
+      this.results_reset_cleanup();
       if (typeof Event.simulate === 'function') this.form_field.simulate("change");
       if (this.active_field) return this.results_hide();
     };
 
+    Chosen.prototype.results_reset_cleanup = function() {
+      var deselect_trigger;
+      deselect_trigger = this.selected_item.down("abbr");
+      if (deselect_trigger) return deselect_trigger.remove();
+    };
+
     Chosen.prototype.result_select = function(evt) {
       var high, item, position;
       if (this.result_highlight) {

coffee/chosen.jquery.coffee

@@ -324,9 +324,12 @@ class Chosen extends AbstractChosen
     @selected_item.find("span").text @default_text
     @selected_item.addClass("chzn-default") if not @is_multiple
     this.show_search_field_default()
-    @selected_item.find("abbr").remove()
+    this.results_reset_cleanup()
     @form_field_jq.trigger "change"
     this.results_hide() if @active_field
+
+  results_reset_cleanup: ->
+    @selected_item.find("abbr").remove()
 
   result_select: (evt) ->
     if @result_highlight

coffee/chosen.proto.coffee

@@ -316,9 +316,13 @@ class Chosen extends AbstractChosen
     @selected_item.down("span").update(@default_text)
     @selected_item.addClassName("chzn-default") if not @is_multiple
     this.show_search_field_default()
-    @selected_item.down("abbr").remove()
+    this.results_reset_cleanup()
     @form_field.simulate("change") if typeof Event.simulate is 'function'
     this.results_hide() if @active_field
+
+  results_reset_cleanup: ->
+    deselect_trigger = @selected_item.down("abbr")
+    deselect_trigger.remove() if(deselect_trigger)
 
   result_select: (evt) ->
     if @result_highlight

coffee/lib/abstract-chosen.coffee

@@ -70,7 +70,7 @@ class AbstractChosen
       ""
 
   results_update_field: ->
-    this.results_reset()
+    this.results_reset_cleanup() if not @is_multiple
     this.result_clear_highlight()
     @result_single_selected = null
     this.results_build()