chosen-rails 0.9.8.2 → 0.9.8.3

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = "0.9.8.2"
-    EDITOR_VERSION = "0.9.8"
+    VERSION = "0.9.8.3"
+    CHOSEN_VERSION = "0.9.8"
   end
 end

data/vendor/assets/javascripts/chosen.jquery.coffee

@@ -8,7 +8,8 @@ $ = jQuery
 $.fn.extend({
   chosen: (options) ->
     # Do no harm and return as soon as possible for unsupported browsers, namely IE6 and IE7
-    return this if $.browser.msie and ($.browser.version is "6.0" or  $.browser.version is "7.0")
+    # Continue on if running IE document type but in compatibility mode
+    return this if $.browser.msie and ($.browser.version is "6.0" or  ($.browser.version is "7.0" and document.documentMode is 7 ))
     this.each((input_field) ->
       $this = $ this
       $this.data('chosen', new Chosen(this, options)) unless $this.hasClass "chzn-done"
@@ -82,6 +83,8 @@ class Chosen extends AbstractChosen
     @search_results.mouseout (evt) => this.search_results_mouseout(evt)
 
     @form_field_jq.bind "liszt:updated", (evt) => this.results_update_field(evt)
+    @form_field_jq.bind "liszt:activate", (evt) => this.activate_field(evt)
+    @form_field_jq.bind "liszt:open", (evt) => this.container_mousedown(evt)
 
     @search_field.blur (evt) => this.input_blur(evt)
     @search_field.keyup (evt) => this.keyup_checker(evt)
@@ -173,7 +176,7 @@ class Chosen extends AbstractChosen
       @choices = 0
     else if not @is_multiple
       @selected_item.addClass("chzn-default").find("span").text(@default_text)
-      if @form_field.options.length <= @disable_search_threshold
+      if @disable_search or @form_field.options.length <= @disable_search_threshold
         @container.addClass "chzn-container-single-nosearch"
       else
         @container.removeClass "chzn-container-single-nosearch"
@@ -299,7 +302,11 @@ class Chosen extends AbstractChosen
       return false # fire event
     choice_id = @container_id + "_c_" + item.array_index
     @choices += 1
-    @search_container.before  '<li class="search-choice" id="' + choice_id + '"><span>' + item.html + '</span><a href="javascript:void(0)" class="search-choice-close" rel="' + item.array_index + '"></a></li>'
+    if item.disabled
+      html = '<li class="search-choice search-choice-disabled" id="' + choice_id + '"><span>' + item.html + '</span></li>'
+    else
+      html = '<li class="search-choice" id="' + choice_id + '"><span>' + item.html + '</span><a href="javascript:void(0)" class="search-choice-close" rel="' + item.array_index + '"></a></li>'
+    @search_container.before  html
     link = $('#' + choice_id).find("a").first()
     link.click (evt) => this.choice_destroy_link_click(evt)
 
@@ -312,13 +319,13 @@ class Chosen extends AbstractChosen
       evt.stopPropagation
 
   choice_destroy: (link) ->
-    @choices -= 1
-    this.show_search_field_default()
+    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 @choices > 0 and @search_field.val().length < 1
 
-    this.result_deselect (link.attr "rel")
-    link.parents('li').first().remove()
+      link.parents('li').first().remove()
 
   results_reset: ->
     @form_field.options[0].selected = true
@@ -330,6 +337,7 @@ class Chosen extends AbstractChosen
     this.results_hide() if @active_field
   
   results_reset_cleanup: ->
+    @current_value = @form_field_jq.val()
     @selected_item.find("abbr").remove()
 
   result_select: (evt) ->
@@ -376,17 +384,23 @@ class Chosen extends AbstractChosen
 
   result_deselect: (pos) ->
     result_data = @results_data[pos]
-    result_data.selected = false
 
-    @form_field.options[result_data.options_index].selected = false
-    result = $("#" + @container_id + "_o_" + pos)
-    result.removeClass("result-selected").addClass("active-result").show()
+    if not @form_field.options[result_data.options_index].disabled
+      result_data.selected = false
+      
+      @form_field.options[result_data.options_index].selected = false
+      result = $("#" + @container_id + "_o_" + pos)
+      result.removeClass("result-selected").addClass("active-result").show()
 
-    this.result_clear_highlight()
-    this.winnow_results()
+      this.result_clear_highlight()
+      this.winnow_results()
 
-    @form_field_jq.trigger "change", {deselected: @form_field.options[result_data.options_index].value}
-    this.search_field_scale()
+      @form_field_jq.trigger "change", {deselected: @form_field.options[result_data.options_index].value}
+      this.search_field_scale()
+      
+      return true
+    else
+      return false
 
   single_deselect_control_build: ->
     @selected_item.find("span").first().after "<abbr class=\"search-choice-close\"></abbr>" if @allow_single_deselect and @selected_item.find("abbr").length < 1
@@ -497,11 +511,13 @@ class Chosen extends AbstractChosen
       this.choice_destroy @pending_backstroke.find("a").first()
       this.clear_backstroke()
     else
-      @pending_backstroke = @search_container.siblings("li.search-choice").last()
-      if @single_backstroke_delete
-        @keydown_backstroke()
-      else
-        @pending_backstroke.addClass "search-choice-focus"
+      next_available_destroy = @search_container.siblings("li.search-choice").last()
+      if next_available_destroy.length and not next_available_destroy.hasClass("search-choice-disabled")
+        @pending_backstroke = next_available_destroy
+        if @single_backstroke_delete
+          @keydown_backstroke()
+        else
+          @pending_backstroke.addClass "search-choice-focus"
 
   clear_backstroke: ->
     @pending_backstroke.removeClass "search-choice-focus" if @pending_backstroke

data/vendor/assets/javascripts/chosen.proto.coffee

@@ -20,6 +20,7 @@ class Chosen extends AbstractChosen
     @single_temp = new Template('<a href="javascript:void(0)" class="chzn-single chzn-default"><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>')
     @multi_temp = new Template('<ul class="chzn-choices"><li class="search-field"><input type="text" value="#{default}" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>')
     @choice_temp = new Template('<li class="search-choice" id="#{id}"><span>#{choice}</span><a href="javascript:void(0)" class="search-choice-close" rel="#{position}"></a></li>')
+    @choice_noclose_temp = new Template('<li class="search-choice search-choice-disabled" id="#{id}"><span>#{choice}</span></li>')
     @no_results_temp = new Template('<li class="no-results">' + @results_none_found + ' "<span>#{terms}</span>"</li>')
 
   set_up_html: ->
@@ -74,6 +75,8 @@ class Chosen extends AbstractChosen
     @search_results.observe "mouseout", (evt) => this.search_results_mouseout(evt)
     
     @form_field.observe "liszt:updated", (evt) => this.results_update_field(evt)
+    @form_field.observe "liszt:activate", (evt) => this.activate_field(evt)
+    @form_field.observe "liszt:open", (evt) => this.container_mousedown(evt)
 
     @search_field.observe "blur", (evt) => this.input_blur(evt)
     @search_field.observe "keyup", (evt) => this.keyup_checker(evt)
@@ -164,7 +167,7 @@ class Chosen extends AbstractChosen
       @choices = 0
     else if not @is_multiple
       @selected_item.addClassName("chzn-default").down("span").update(@default_text)
-      if @form_field.options.length <= @disable_search_threshold
+      if @disable_search or @form_field.options.length <= @disable_search_threshold
         @container.addClassName "chzn-container-single-nosearch"
       else
         @container.removeClassName "chzn-container-single-nosearch"
@@ -290,12 +293,13 @@ class Chosen extends AbstractChosen
     choice_id = @container_id + "_c_" + item.array_index
     @choices += 1
     @search_container.insert
-      before: @choice_temp.evaluate
+      before: (if item.disabled then @choice_noclose_temp else @choice_temp).evaluate
         id:       choice_id
         choice:   item.html
         position: item.array_index
-    link = $(choice_id).down('a')
-    link.observe "click", (evt) => this.choice_destroy_link_click(evt)
+    if not item.disabled
+      link = $(choice_id).down('a')
+      link.observe "click", (evt) => this.choice_destroy_link_click(evt)
 
   choice_destroy_link_click: (evt) ->
     evt.preventDefault()
@@ -304,13 +308,13 @@ class Chosen extends AbstractChosen
       this.choice_destroy evt.target
 
   choice_destroy: (link) ->
-    @choices -= 1
-    this.show_search_field_default()
+    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 @choices > 0 and @search_field.value.length < 1
 
-    this.result_deselect link.readAttribute("rel")
-    link.up('li').remove()
+      link.up('li').remove()
 
   results_reset: ->
     @form_field.options[0].selected = true
@@ -322,6 +326,7 @@ class Chosen extends AbstractChosen
     this.results_hide() if @active_field
 
   results_reset_cleanup: ->
+    @current_value = @form_field.value
     deselect_trigger = @selected_item.down("abbr")
     deselect_trigger.remove() if(deselect_trigger)
   
@@ -368,17 +373,22 @@ class Chosen extends AbstractChosen
 
   result_deselect: (pos) ->
     result_data = @results_data[pos]
-    result_data.selected = false
+    
+    if not @form_field.options[result_data.options_index].disabled
+      result_data.selected = false
 
-    @form_field.options[result_data.options_index].selected = false
-    result = $(@container_id + "_o_" + pos)
-    result.removeClassName("result-selected").addClassName("active-result").show()
+      @form_field.options[result_data.options_index].selected = false
+      result = $(@container_id + "_o_" + pos)
+      result.removeClassName("result-selected").addClassName("active-result").show()
 
-    this.result_clear_highlight()
-    this.winnow_results()
+      this.result_clear_highlight()
+      this.winnow_results()
 
-    @form_field.simulate("change") if typeof Event.simulate is 'function'
-    this.search_field_scale()
+      @form_field.simulate("change") if typeof Event.simulate is 'function'
+      this.search_field_scale()
+      return true
+    else
+      return false
     
   single_deselect_control_build: ->
     @selected_item.down("span").insert { after: "<abbr class=\"search-choice-close\"></abbr>" } if @allow_single_deselect and not @selected_item.down("abbr")
@@ -494,11 +504,14 @@ class Chosen extends AbstractChosen
       this.choice_destroy @pending_backstroke.down("a")
       this.clear_backstroke()
     else
-      @pending_backstroke = @search_container.siblings("li.search-choice").last()
-      if @single_backstroke_delete
-        @keydown_backstroke()
-      else
-        @pending_backstroke.addClassName("search-choice-focus")
+      next_available_destroy = @search_container.siblings().last()
+      if next_available_destroy and next_available_destroy.hasClassName("search-choice") and not next_available_destroy.hasClassName("search-choice-disabled")
+        @pending_backstroke = next_available_destroy
+        @pending_backstroke.addClassName("search-choice-focus") if @pending_backstroke
+        if @single_backstroke_delete
+          @keydown_backstroke()
+        else
+          @pending_backstroke.addClassName("search-choice-focus")
 
   clear_backstroke: ->
     @pending_backstroke.removeClassName("search-choice-focus") if @pending_backstroke

data/vendor/assets/javascripts/lib/abstract-chosen.coffee

@@ -29,6 +29,7 @@ class AbstractChosen
     @result_single_selected = null
     @allow_single_deselect = if @options.allow_single_deselect? and @form_field.options[0]? and @form_field.options[0].text is "" then @options.allow_single_deselect else false
     @disable_search_threshold = @options.disable_search_threshold || 0
+    @disable_search = @options.disable_search || false
     @search_contains = @options.search_contains || false
     @choices = 0
     @single_backstroke_delete = @options.single_backstroke_delete || false

data/vendor/assets/javascripts/lib/select-parser.coffee

@@ -5,7 +5,7 @@ class SelectParser
     @parsed = []
 
   add_node: (child) ->
-    if child.nodeName is "OPTGROUP"
+    if child.nodeName.toUpperCase() is "OPTGROUP"
       this.add_group child
     else
       this.add_option child
@@ -21,7 +21,7 @@ class SelectParser
     this.add_option( option, group_position, group.disabled ) for option in group.childNodes
 
   add_option: (option, group_position, group_disabled) ->
-    if option.nodeName is "OPTION"
+    if option.nodeName.toUpperCase() is "OPTION"
       if option.text != ""
         if group_position?
           @parsed[group_position].children += 1

data/vendor/assets/stylesheets/chosen.css.sass

@@ -182,6 +182,18 @@
     margin: 3px 0 3px 5px
     position: relative
     cursor: default
+    &.search-choice-disabled
+      background-color: #e4e4e4
+      filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 )
+      background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee))
+      background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%)
+      background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%)
+      background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%)
+      background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%)
+      background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%)
+      color: #666
+      border: 1px solid #cccccc
+      padding-right: 5px
   .search-choice-focus
     background: #d4d4d4
   .search-choice .search-choice-close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chosen-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.8.2
+  version: 0.9.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -130,18 +130,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1777641325023975397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1777641325023975397
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24