Fix external js updates to multi-selects

chosen/chosen.jquery.js

@@ -340,6 +340,10 @@ Copyright (c) 2011 by Harvest
       return this.is_rtl = this.form_field_jq.hasClass("chzn-rtl");
     };
 
+    Chosen.prototype.choices = function() {
+      return this.form_field_jq.children('option[selected=true]').length;
+    };
+
     Chosen.prototype.finish_setup = function() {
       return this.form_field_jq.addClass("chzn-done");
     };
@@ -540,9 +544,8 @@ Copyright (c) 2011 by Harvest
       var content, data, _i, _len, _ref;
       this.parsing = true;
       this.results_data = root.SelectParser.select_to_array(this.form_field);
-      if (this.is_multiple && this.choices > 0) {
+      if (this.is_multiple && this.choices() > 0) {
         this.search_choices.find("li.search-choice").remove();
-        this.choices = 0;
       } else if (!this.is_multiple) {
         this.selected_item.addClass("chzn-default").find("span").text(this.default_text);
         if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) {
@@ -618,7 +621,7 @@ Copyright (c) 2011 by Harvest
         if (this.result_single_selected) {
           this.result_do_highlight(this.result_single_selected);
         }
-      } else if (this.max_selected_options <= this.choices) {
+      } else if (this.max_selected_options <= this.choices()) {
         this.form_field_jq.trigger("liszt:maxselected", {
           chosen: this
         });
@@ -662,7 +665,7 @@ Copyright (c) 2011 by Harvest
     };
 
     Chosen.prototype.show_search_field_default = function() {
-      if (this.is_multiple && this.choices < 1 && !this.active_field) {
+      if (this.is_multiple && this.choices() < 1 && !this.active_field) {
         this.search_field.val(this.default_text);
         return this.search_field.addClass("default");
       } else {
@@ -705,14 +708,13 @@ Copyright (c) 2011 by Harvest
     Chosen.prototype.choice_build = function(item) {
       var choice_id, html, link,
         _this = this;
-      if (this.is_multiple && this.max_selected_options <= this.choices) {
+      if (this.is_multiple && this.max_selected_options <= this.choices()) {
         this.form_field_jq.trigger("liszt:maxselected", {
           chosen: this
         });
         return false;
       }
       choice_id = this.container_id + "_c_" + item.array_index;
-      this.choices += 1;
       if (item.disabled) {
         html = '<li class="search-choice search-choice-disabled" id="' + choice_id + '"><span>' + item.html + '</span></li>';
       } else {
@@ -737,9 +739,8 @@ Copyright (c) 2011 by Harvest
 
     Chosen.prototype.choice_destroy = function(link) {
       if (this.result_deselect(link.attr("rel"))) {
-        this.choices -= 1;
         this.show_search_field_default();
-        if (this.is_multiple && this.choices > 0 && this.search_field.val().length < 1) {
+        if (this.is_multiple && this.choices() > 0 && this.search_field.val().length < 1) {
           this.results_hide();
         }
         link.parents('li').first().remove();
@@ -970,7 +971,7 @@ Copyright (c) 2011 by Harvest
         if (prev_sibs.length) {
           return this.result_do_highlight(prev_sibs.first());
         } else {
-          if (this.choices > 0) {
+          if (this.choices() > 0) {
             this.results_hide();
           }
           return this.result_clear_highlight();

chosen/chosen.proto.js

@@ -319,6 +319,10 @@ Copyright (c) 2011 by Harvest
       return this.form_field.addClassName("chzn-done");
     };
 
+    Chosen.prototype.choices = function() {
+      return this.form_field.select('option[selected=true]').length;
+    };
+
     Chosen.prototype.set_default_values = function() {
       Chosen.__super__.set_default_values.call(this);
       this.single_temp = new Template('<a href="javascript:void(0)" class="chzn-single chzn-default" tabindex="-1"><span>#{default}</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>');
@@ -523,9 +527,8 @@ Copyright (c) 2011 by Harvest
       var content, data, _i, _len, _ref;
       this.parsing = true;
       this.results_data = root.SelectParser.select_to_array(this.form_field);
-      if (this.is_multiple && this.choices > 0) {
+      if (this.is_multiple && this.choices() > 0) {
         this.search_choices.select("li.search-choice").invoke("remove");
-        this.choices = 0;
       } else if (!this.is_multiple) {
         this.selected_item.addClassName("chzn-default").down("span").update(this.default_text);
         if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) {
@@ -599,7 +602,7 @@ Copyright (c) 2011 by Harvest
         if (this.result_single_selected) {
           this.result_do_highlight(this.result_single_selected);
         }
-      } else if (this.max_selected_options <= this.choices) {
+      } else if (this.max_selected_options <= this.choices()) {
         this.form_field.fire("liszt:maxselected", {
           chosen: this
         });
@@ -643,7 +646,7 @@ Copyright (c) 2011 by Harvest
     };
 
     Chosen.prototype.show_search_field_default = function() {
-      if (this.is_multiple && this.choices < 1 && !this.active_field) {
+      if (this.is_multiple && this.choices() < 1 && !this.active_field) {
         this.search_field.value = this.default_text;
         return this.search_field.addClassName("default");
       } else {
@@ -686,14 +689,13 @@ Copyright (c) 2011 by Harvest
     Chosen.prototype.choice_build = function(item) {
       var choice_id, link,
         _this = this;
-      if (this.is_multiple && this.max_selected_options <= this.choices) {
+      if (this.is_multiple && this.max_selected_options <= this.choices()) {
         this.form_field.fire("liszt:maxselected", {
           chosen: this
         });
         return false;
       }
       choice_id = this.container_id + "_c_" + item.array_index;
-      this.choices += 1;
       this.search_container.insert({
         before: (item.disabled ? this.choice_noclose_temp : this.choice_temp).evaluate({
           id: choice_id,
@@ -719,9 +721,8 @@ Copyright (c) 2011 by Harvest
 
     Chosen.prototype.choice_destroy = function(link) {
       if (this.result_deselect(link.readAttribute("rel"))) {
-        this.choices -= 1;
         this.show_search_field_default();
-        if (this.is_multiple && this.choices > 0 && this.search_field.value.length < 1) {
+        if (this.is_multiple && this.choices() > 0 && this.search_field.value.length < 1) {
           this.results_hide();
         }
         link.up('li').remove();
@@ -916,7 +917,7 @@ Copyright (c) 2011 by Harvest
         if (!this.is_multiple) {
           do_high = this.search_results.down(".result-selected.active-result");
         }
-        if (!(do_high != null)) {
+        if (do_high == null) {
           do_high = this.search_results.down(".active-result");
         }
         if (do_high != null) {
@@ -971,7 +972,7 @@ Copyright (c) 2011 by Harvest
         if (prevs.length) {
           return this.result_do_highlight(prevs.first());
         } else {
-          if (this.choices > 0) {
+          if (this.choices() > 0) {
             this.results_hide();
           }
           return this.result_clear_highlight();

coffee/chosen.jquery.coffee

@@ -10,11 +10,11 @@ $.fn.extend({
     ua = navigator.userAgent.toLowerCase();
 
     match = /(msie) ([\w.]+)/.exec( ua ) || [];
-    
+
     browser =
       name: match[ 1 ] || ""
       version: match[ 2 ] || "0"
-      
+
     # Do no harm and return as soon as possible for unsupported browsers, namely IE6 and IE7
     # Continue on if running IE document type but in compatibility mode
     return this if browser.name is "msie" and (browser.version is "6.0" or  (browser.version is "7.0" and document.documentMode is 7 ))
@@ -31,6 +31,9 @@ class Chosen extends AbstractChosen
     @current_value = @form_field_jq.val()
     @is_rtl = @form_field_jq.hasClass "chzn-rtl"
 
+  choices: ->
+    return @form_field_jq.children('option[selected=true]').length
+
   finish_setup: ->
     @form_field_jq.addClass "chzn-done"
 
@@ -45,7 +48,7 @@ class Chosen extends AbstractChosen
 
     @f_width = @form_field_jq.outerWidth()
 
-    container_props = 
+    container_props =
       id: @container_id
       class: container_classes.join ' '
       style: 'width: ' + (@f_width) + 'px;' #use parens around @f_width so coffeescript doesn't think + ' px' is a function parameter
@@ -178,9 +181,8 @@ class Chosen extends AbstractChosen
     @parsing = true
     @results_data = root.SelectParser.select_to_array @form_field
 
-    if @is_multiple and @choices > 0
+    if @is_multiple and this.choices() > 0
       @search_choices.find("li.search-choice").remove()
-      @choices = 0
     else if not @is_multiple
       @selected_item.addClass("chzn-default").find("span").text(@default_text)
       if @disable_search or @form_field.options.length <= @disable_search_threshold
@@ -243,7 +245,7 @@ class Chosen extends AbstractChosen
       @selected_item.addClass "chzn-single-with-drop"
       if @result_single_selected
         this.result_do_highlight( @result_single_selected )
-    else if @max_selected_options <= @choices
+    else if @max_selected_options <= this.choices()
       @form_field_jq.trigger("liszt:maxselected", {chosen: this})
       return false
 
@@ -272,7 +274,7 @@ class Chosen extends AbstractChosen
       @search_field.attr "tabindex", ti
 
   show_search_field_default: ->
-    if @is_multiple and @choices < 1 and not @active_field
+    if @is_multiple and this.choices() < 1 and not @active_field
       @search_field.val(@default_text)
       @search_field.addClass "default"
     else
@@ -300,11 +302,10 @@ class Chosen extends AbstractChosen
       this.results_show()
 
   choice_build: (item) ->
-    if @is_multiple and @max_selected_options <= @choices
+    if @is_multiple and @max_selected_options <= this.choices()
       @form_field_jq.trigger("liszt:maxselected", {chosen: this})
       return false # fire event
     choice_id = @container_id + "_c_" + item.array_index
-    @choices += 1
     if item.disabled
       html = '<li class="search-choice search-choice-disabled" id="' + choice_id + '"><span>' + item.html + '</span></li>'
     else
@@ -323,10 +324,9 @@ class Chosen extends AbstractChosen
 
   choice_destroy: (link) ->
     if this.result_deselect (link.attr "rel")
-      @choices -= 1
       this.show_search_field_default()
 
-      this.results_hide() if @is_multiple and @choices > 0 and @search_field.val().length < 1
+      this.results_hide() if @is_multiple and this.choices() > 0 and @search_field.val().length < 1
 
       link.parents('li').first().remove()
 
@@ -508,7 +508,7 @@ class Chosen extends AbstractChosen
       if prev_sibs.length
         this.result_do_highlight prev_sibs.first()
       else
-        this.results_hide() if @choices > 0
+        this.results_hide() if this.choices() > 0
         this.result_clear_highlight()
 
   keydown_backstroke: ->

coffee/chosen.proto.coffee

@@ -13,6 +13,9 @@ class Chosen extends AbstractChosen
   finish_setup: ->
     @form_field.addClassName "chzn-done"
 
+  choices: ->
+    return @form_field.select('option[selected=true]').length
+
   set_default_values: ->
     super()
 
@@ -38,7 +41,7 @@ class Chosen extends AbstractChosen
       'class': container_classes.join ' '
       'style': 'width: ' + (@f_width) + 'px' #use parens around @f_width so coffeescript doesn't think + ' px' is a function parameter
       'title': @form_field.title
-    
+
     base_template = if @is_multiple then new Element('div', container_props).update( @multi_temp.evaluate({ "default": @default_text}) ) else new Element('div', container_props).update( @single_temp.evaluate({ "default":@default_text }) )
 
     @form_field.hide().insert({ after: base_template })
@@ -158,9 +161,8 @@ class Chosen extends AbstractChosen
     @parsing = true
     @results_data = root.SelectParser.select_to_array @form_field
 
-    if @is_multiple and @choices > 0
+    if @is_multiple and this.choices() > 0
       @search_choices.select("li.search-choice").invoke("remove")
-      @choices = 0
     else if not @is_multiple
       @selected_item.addClassName("chzn-default").down("span").update(@default_text)
       if @disable_search or @form_field.options.length <= @disable_search_threshold
@@ -222,7 +224,7 @@ class Chosen extends AbstractChosen
       @selected_item.addClassName('chzn-single-with-drop')
       if @result_single_selected
         this.result_do_highlight( @result_single_selected )
-    else if @max_selected_options <= @choices
+    else if @max_selected_options <= this.choices()
       @form_field.fire("liszt:maxselected", {chosen: this})
       return false
 
@@ -251,7 +253,7 @@ class Chosen extends AbstractChosen
       @search_field.tabIndex = ti
 
   show_search_field_default: ->
-    if @is_multiple and @choices < 1 and not @active_field
+    if @is_multiple and this.choices() < 1 and not @active_field
       @search_field.value = @default_text
       @search_field.addClassName "default"
     else
@@ -279,11 +281,10 @@ class Chosen extends AbstractChosen
       this.results_show()
 
   choice_build: (item) ->
-    if @is_multiple and @max_selected_options <= @choices
+    if @is_multiple and @max_selected_options <= this.choices()
       @form_field.fire("liszt:maxselected", {chosen: this})
       return false
     choice_id = @container_id + "_c_" + item.array_index
-    @choices += 1
     @search_container.insert
       before: (if item.disabled then @choice_noclose_temp else @choice_temp).evaluate
         id:       choice_id
@@ -301,10 +302,9 @@ class Chosen extends AbstractChosen
 
   choice_destroy: (link) ->
     if this.result_deselect link.readAttribute("rel")
-      @choices -= 1
       this.show_search_field_default()
 
-      this.results_hide() if @is_multiple and @choices > 0 and @search_field.value.length < 1
+      this.results_hide() if @is_multiple and this.choices() > 0 and @search_field.value.length < 1
 
       link.up('li').remove()
 
@@ -490,7 +490,7 @@ class Chosen extends AbstractChosen
       if prevs.length
         this.result_do_highlight prevs.first()
       else
-        this.results_hide() if @choices > 0
+        this.results_hide() if this.choices() > 0
         this.result_clear_highlight()
 
   keydown_backstroke: ->