chosen-rails 0.9.15 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac675bdf969fb0dc587c152a924a2eadff6d44f
-  data.tar.gz: 727f3bb3d99c34502ce16b8d32b60b693eb3c1b7
+  metadata.gz: 9cc8bd119b65d642d99ed11363c0dcb055ddc077
+  data.tar.gz: 3ea9543936eeebdb80c7726779463219b1328ca5
 SHA512:
-  metadata.gz: 7f8d165ce179fe3882a0846d1d3be752a192f2633f61ee4bf04ea9c2f1b2d874f52f9930bf506f880fe3ba4596c2fa13bfdbdbb3c1e4180e53c3124bd7bfa0b4
-  data.tar.gz: 56b856a0637d3f5c09d49be9c376af8d78249691b55fc5b285bb0966759998f7053fe3717e47be34e4453826ff3a64974e2a1e671290b6e3b3084ed79d7768c4
+  metadata.gz: 4b6b8a50e83ab7223568c9875f137cc5fc16210c93e8f47c12804b37c05f6c58de9685a2bed8e8598251f91cc1306ac7e689ec057e29fbe53724caa1672f4237
+  data.tar.gz: 9421014b4e4f11a55f477e1648ff2ec6109f4c8b7762eafa85cadad5c8918ebe2fa4e763920fd34e27ab9b54331eead8fb7b805f8c293e0cec13fc82a5361c73

data/README.md

@@ -39,7 +39,9 @@ Add to one coffee script file, like `scaffold.js.coffee`
       $('.chzn-select').chosen
         allow_single_deselect: true
         no_results_text: 'No results matched'
+        width: '200px'
 
+Notice: `width` option is required since `Chosen 0.9.15`.
 
 And this file must be included in `application.js`
 

data/lib/chosen-rails/source_file.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'json'
 
 class SourceFile < Thor
   include Thor::Actions
@@ -6,14 +7,14 @@ class SourceFile < Thor
   desc 'fetch source files', 'fetch source files from GitHub'
   def fetch remote, branch
     self.destination_root = 'vendor/assets'
-    get "#{remote}/raw/#{branch}/chosen/chosen-sprite.png", 'images/chosen-sprite.png'
-    get "#{remote}/raw/#{branch}/chosen/chosen-sprite@2x.png", 'images/chosen-sprite@2x.png'
-    get "#{remote}/raw/#{branch}/chosen/chosen.css", 'stylesheets/chosen.css'
+    get "#{remote}/raw/#{branch}/public/chosen-sprite.png", 'images/chosen-sprite.png'
+    get "#{remote}/raw/#{branch}/public/chosen-sprite@2x.png", 'images/chosen-sprite@2x.png'
+    get "#{remote}/raw/#{branch}/public/chosen.css", 'stylesheets/chosen.css'
     get "#{remote}/raw/#{branch}/coffee/lib/abstract-chosen.coffee", 'javascripts/lib/abstract-chosen.coffee'
     get "#{remote}/raw/#{branch}/coffee/lib/select-parser.coffee", 'javascripts/lib/select-parser.coffee'
     get "#{remote}/raw/#{branch}/coffee/chosen.jquery.coffee", 'javascripts/chosen.jquery.coffee'
     get "#{remote}/raw/#{branch}/coffee/chosen.proto.coffee", 'javascripts/chosen.proto.coffee'
-    get "#{remote}/raw/#{branch}/VERSION", 'VERSION'
+    get "#{remote}/raw/#{branch}/package.json", 'package.json'
     bump_version
   end
 
@@ -32,14 +33,15 @@ class SourceFile < Thor
   def cleanup
     self.destination_root = 'vendor/assets'
     remove_file 'stylesheets/chosen.css'
-    remove_file 'VERSION'
+    remove_file 'package.json'
   end
 
   protected
 
   def bump_version
     inside destination_root do
-      version = File.read('VERSION').sub("\n", '')
+      package_json = JSON.load(File.open('package.json'))
+      version = package_json['version']
       gsub_file '../../lib/chosen-rails/version.rb', /CHOSEN_VERSION\s=\s'(\d|\.)+'$/ do |match|
         %Q{CHOSEN_VERSION = '#{version}'}
       end

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = '0.9.15'
-    CHOSEN_VERSION = '0.9.15'
+    VERSION = '0.10.0'
+    CHOSEN_VERSION = '0.10.0'
   end
 end

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

@@ -1,7 +1,3 @@
-###
-Chosen source: generate output using 'cake build'
-Copyright (c) 2011 by Harvest
-###
 root = this
 $ = jQuery
 
@@ -142,7 +138,6 @@ class Chosen extends AbstractChosen
     this.results_hide()
 
     @container.removeClass "chzn-container-active"
-    this.winnow_results_clear()
     this.clear_backstroke()
 
     this.show_search_field_default()
@@ -168,13 +163,15 @@ class Chosen extends AbstractChosen
 
     @results_data = root.SelectParser.select_to_array @form_field
 
-    if @is_multiple and this.choices_count() > 0
+    if @is_multiple
       @search_choices.find("li.search-choice").remove()
     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
+        @search_field[0].readOnly = true
         @container.addClass "chzn-container-single-nosearch"
       else
+        @search_field[0].readOnly = false
         @container.removeClass "chzn-container-single-nosearch"
 
     content = ''
@@ -196,13 +193,9 @@ class Chosen extends AbstractChosen
     @search_results.html content
     @parsing = false
 
-
   result_add_group: (group) ->
-    if not group.disabled
-      group.dom_id = @container_id + "_g_" + group.array_index
-      '<li id="' + group.dom_id + '" class="group-result">' + $("<div />").text(group.label).html() + '</li>'
-    else
-      ""
+    group.dom_id = @container_id + "_g_" + group.array_index
+    '<li id="' + group.dom_id + '" class="group-result">' + $("<div />").text(group.label).html() + '</li>'
 
   result_do_highlight: (el) ->
     if el.length
@@ -228,9 +221,7 @@ class Chosen extends AbstractChosen
     @result_highlight = null
 
   results_show: ->
-    if @result_single_selected?
-      this.result_do_highlight @result_single_selected
-    else if @is_multiple and @max_selected_options <= this.choices_count()
+    if @is_multiple and @max_selected_options <= this.choices_count()
       @form_field_jq.trigger("liszt:maxselected", {chosen: this})
       return false
 
@@ -245,10 +236,11 @@ class Chosen extends AbstractChosen
     this.winnow_results()
 
   results_hide: ->
-    this.result_clear_highlight()
+    if @results_showing
+      this.result_clear_highlight()
 
-    @container.removeClass "chzn-with-drop"
-    @form_field_jq.trigger("liszt:hiding_dropdown", {chosen: this})
+      @container.removeClass "chzn-with-drop"
+      @form_field_jq.trigger("liszt:hiding_dropdown", {chosen: this})
 
     @results_showing = false
 
@@ -342,7 +334,7 @@ class Chosen extends AbstractChosen
         return false
 
       if @is_multiple
-        this.result_deactivate high
+        high.removeClass("active-result")
       else
         @search_results.find(".result-selected").removeClass "result-selected"
         @result_single_selected = high
@@ -371,11 +363,16 @@ class Chosen extends AbstractChosen
       @current_selectedIndex = @form_field.selectedIndex
       this.search_field_scale()
 
-  result_activate: (el) ->
-    el.addClass("active-result")
+  result_activate: (el, option) ->
+    if option.disabled
+      el.addClass("disabled-result")
+    else if @is_multiple and option.selected
+      el.addClass("result-selected")
+    else
+      el.addClass("active-result")
 
   result_deactivate: (el) ->
-    el.removeClass("active-result")
+    el.removeClass("active-result result-selected disabled-result")
 
   result_deselect: (pos) ->
     result_data = @results_data[pos]
@@ -400,7 +397,9 @@ class Chosen extends AbstractChosen
       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
+    return unless @allow_single_deselect
+    @selected_item.find("span").first().after "<abbr class=\"search-choice-close\"></abbr>" unless @selected_item.find("abbr").length
+    @selected_item.addClass("chzn-single-with-deselect")
 
   winnow_results: ->
     this.no_results_clear()
@@ -413,10 +412,10 @@ class Chosen extends AbstractChosen
     zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
 
     for option in @results_data
-      if not option.disabled and not option.empty
+      if not option.empty
         if option.group
           $('#' + option.dom_id).css('display', 'none')
-        else if not (@is_multiple and option.selected)
+        else
           found = false
           result_id = option.dom_id
           result = $("#" + result_id)
@@ -442,7 +441,7 @@ class Chosen extends AbstractChosen
               text = option.html
 
             result.html(text)
-            this.result_activate result
+            this.result_activate result, option
 
             $("#" + @results_data[option.group_array_index].dom_id).css('display', 'list-item') if option.group_array_index?
           else
@@ -454,17 +453,6 @@ class Chosen extends AbstractChosen
     else
       this.winnow_results_set_highlight()
 
-  winnow_results_clear: ->
-    @search_field.val ""
-    lis = @search_results.find("li")
-
-    for li in lis
-      li = $(li)
-      if li.hasClass "group-result"
-        li.css('display', 'auto')
-      else if not @is_multiple or not li.hasClass "result-selected"
-        this.result_activate li
-
   winnow_results_set_highlight: ->
     if not @result_highlight
 
@@ -483,13 +471,11 @@ class Chosen extends AbstractChosen
     @search_results.find(".no-results").remove()
 
   keydown_arrow: ->
-    if not @result_highlight
-      first_active = @search_results.find("li.active-result").first()
-      this.result_do_highlight $(first_active) if first_active
-    else if @results_showing
+    if @results_showing and @result_highlight
       next_sib = @result_highlight.nextAll("li.active-result").first()
       this.result_do_highlight next_sib if next_sib
-    this.results_show() if not @results_showing
+    else
+      this.results_show()
 
   keyup_arrow: ->
     if not @results_showing and not @is_multiple
@@ -542,6 +528,7 @@ class Chosen extends AbstractChosen
         this.keyup_arrow()
         break
       when 40
+        evt.preventDefault()
         this.keydown_arrow()
         break
 

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

@@ -1,7 +1,3 @@
-###
-Chosen source: generate output using 'cake build'
-Copyright (c) 2011 by Harvest
-###
 root = this
 
 class Chosen extends AbstractChosen
@@ -131,7 +127,6 @@ class Chosen extends AbstractChosen
     this.results_hide()
 
     @container.removeClassName "chzn-container-active"
-    this.winnow_results_clear()
     this.clear_backstroke()
 
     this.show_search_field_default()
@@ -156,13 +151,15 @@ class Chosen extends AbstractChosen
 
     @results_data = root.SelectParser.select_to_array @form_field
 
-    if @is_multiple and this.choices_count() > 0
+    if @is_multiple
       @search_choices.select("li.search-choice").invoke("remove")
     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
+        @search_field.readOnly = true
         @container.addClassName "chzn-container-single-nosearch"
       else
+        @search_field.readOnly = false
         @container.removeClassName "chzn-container-single-nosearch"
 
     content = ''
@@ -184,13 +181,9 @@ class Chosen extends AbstractChosen
     @search_results.update content
     @parsing = false
 
-
   result_add_group: (group) ->
-    if not group.disabled
-      group.dom_id = @container_id + "_g_" + group.array_index
-      '<li id="' + group.dom_id + '" class="group-result">' + group.label.escapeHTML() + '</li>'
-    else
-      ""
+    group.dom_id = @container_id + "_g_" + group.array_index
+    '<li id="' + group.dom_id + '" class="group-result">' + group.label.escapeHTML() + '</li>'
 
   result_do_highlight: (el) ->
       this.result_clear_highlight()
@@ -202,7 +195,7 @@ class Chosen extends AbstractChosen
       visible_top = @search_results.scrollTop
       visible_bottom = maxHeight + visible_top
 
-      high_top = @result_highlight.positionedOffset().top + @search_results.scrollTop
+      high_top = @result_highlight.positionedOffset().top
       high_bottom = high_top + @result_highlight.getHeight()
 
       if high_bottom >= visible_bottom
@@ -215,9 +208,7 @@ class Chosen extends AbstractChosen
     @result_highlight = null
 
   results_show: ->
-    if @result_single_selected?
-      this.result_do_highlight @result_single_selected
-    else if @is_multiple and @max_selected_options <= this.choices_count()
+    if @is_multiple and @max_selected_options <= this.choices_count()
       @form_field.fire("liszt:maxselected", {chosen: this})
       return false
 
@@ -232,10 +223,11 @@ class Chosen extends AbstractChosen
     this.winnow_results()
 
   results_hide: ->
-    this.result_clear_highlight()
+    if @results_showing
+      this.result_clear_highlight()
 
-    @container.removeClassName "chzn-with-drop"
-    @form_field.fire("liszt:hiding_dropdown", {chosen: this})
+      @container.removeClassName "chzn-with-drop"
+      @form_field.fire("liszt:hiding_dropdown", {chosen: this})
 
     @results_showing = false
 
@@ -328,12 +320,12 @@ class Chosen extends AbstractChosen
         return false
 
       if @is_multiple
-        this.result_deactivate high
+        high.removeClassName("active-result")
       else
         @search_results.descendants(".result-selected").invoke "removeClassName", "result-selected"
         @selected_item.removeClassName("chzn-default")
         @result_single_selected = high
-
+      
       high.addClassName("result-selected")
 
       position = high.id.substr(high.id.lastIndexOf("_") + 1 )
@@ -358,11 +350,18 @@ class Chosen extends AbstractChosen
 
       this.search_field_scale()
 
-  result_activate: (el) ->
-    el.addClassName("active-result")
+  result_activate: (el, option) ->
+    if option.disabled
+      el.addClassName("disabled-result")
+    else if @is_multiple and option.selected
+      el.addClassName("result-selected")
+    else
+      el.addClassName("active-result")
 
   result_deactivate: (el) ->
     el.removeClassName("active-result")
+    el.removeClassName("result-selected")
+    el.removeClassName("disabled-result")
 
   result_deselect: (pos) ->
     result_data = @results_data[pos]
@@ -386,7 +385,9 @@ class Chosen extends AbstractChosen
       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")
+    return unless @allow_single_deselect
+    @selected_item.down("span").insert { after: "<abbr class=\"search-choice-close\"></abbr>" } unless @selected_item.down("abbr")
+    @selected_item.addClassName("chzn-single-with-deselect")
 
   winnow_results: ->
     this.no_results_clear()
@@ -399,10 +400,10 @@ class Chosen extends AbstractChosen
     zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
 
     for option in @results_data
-      if not option.disabled and not option.empty
+      if not option.empty
         if option.group
           $(option.dom_id).hide()
-        else if not (@is_multiple and option.selected)
+        else
           found = false
           result_id = option.dom_id
 
@@ -428,7 +429,7 @@ class Chosen extends AbstractChosen
 
             $(result_id).update text if $(result_id).innerHTML != text
 
-            this.result_activate $(result_id)
+            this.result_activate $(result_id), option
 
             $(@results_data[option.group_array_index].dom_id).setStyle({display: 'list-item'}) if option.group_array_index?
           else
@@ -440,16 +441,6 @@ class Chosen extends AbstractChosen
     else
       this.winnow_results_set_highlight()
 
-  winnow_results_clear: ->
-    @search_field.clear()
-    lis = @search_results.select("li")
-
-    for li in lis
-      if li.hasClassName("group-result")
-        li.show()
-      else if not @is_multiple or not li.hasClassName("result-selected")
-        this.result_activate li
-
   winnow_results_set_highlight: ->
     if not @result_highlight
 
@@ -470,15 +461,11 @@ class Chosen extends AbstractChosen
 
 
   keydown_arrow: ->
-    actives = @search_results.select("li.active-result")
-    if actives.length
-      if not @result_highlight
-        this.result_do_highlight actives.first()
-      else if @results_showing
-        sibs = @result_highlight.nextSiblings()
-        nexts = sibs.intersect(actives)
-        this.result_do_highlight nexts.first() if nexts.length
-      this.results_show() if not @results_showing
+    if @results_showing and @result_highlight
+      next_sib = @result_highlight.next('.active-result')
+      this.result_do_highlight next_sib if next_sib
+    else
+      this.results_show()
 
   keyup_arrow: ->
     if not @results_showing and not @is_multiple
@@ -534,6 +521,7 @@ class Chosen extends AbstractChosen
         this.keyup_arrow()
         break
       when 40
+        evt.preventDefault()
         this.keydown_arrow()
         break
 

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

@@ -1,7 +1,3 @@
-###
-Chosen source: generate output using 'cake build'
-Copyright (c) 2011 by Harvest
-###
 root = this
 
 class AbstractChosen
@@ -61,19 +57,18 @@ class AbstractChosen
       setTimeout (=> this.blur_test()), 100
 
   result_add_option: (option) ->
-    if not option.disabled
-      option.dom_id = @container_id + "_o_" + option.array_index
+    option.dom_id = @container_id + "_o_" + option.array_index
 
-      classes = if option.selected and @is_multiple then [] else ["active-result"]
-      classes.push "result-selected" if option.selected
-      classes.push "group-option" if option.group_array_index?
-      classes.push option.classes if option.classes != ""
+    classes = []
+    classes.push "active-result" if !option.disabled and !(option.selected and @is_multiple)
+    classes.push "disabled-result" if option.disabled and !(option.selected and @is_multiple)
+    classes.push "result-selected" if option.selected
+    classes.push "group-option" if option.group_array_index?
+    classes.push option.classes if option.classes != ""
 
-      style = if option.style.cssText != "" then " style=\"#{option.style}\"" else ""
+    style = if option.style.cssText != "" then " style=\"#{option.style}\"" else ""
 
-      '<li id="' + option.dom_id + '" class="' + classes.join(' ') + '"'+style+'>' + option.html + '</li>'
-    else
-      ""
+    '<li id="' + option.dom_id + '" class="' + classes.join(' ') + '"'+style+'>' + option.html + '</li>'
 
   results_update_field: ->
     this.set_default_text()
@@ -105,7 +100,7 @@ class AbstractChosen
 
   choices_click: (evt) ->
     evt.preventDefault()
-    this.results_show() unless @results_showing
+    this.results_show() unless @results_showing or @is_disabled
 
   keyup_checker: (evt) ->
     stroke = evt.which ? evt.keyCode

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

@@ -61,26 +61,27 @@
     text-decoration: none
   .chzn-default
     color: #999
-  .chzn-single
-    span
-      margin-right: 26px
-      display: block
-      overflow: hidden
-      white-space: nowrap
-      -o-text-overflow: ellipsis
-      -ms-text-overflow: ellipsis
-      text-overflow: ellipsis
-    abbr
-      display: block
-      position: absolute
-      right: 26px
-      top: 6px
-      width: 12px
-      height: 12px
-      font-size: 1px
-      background: image-url('chosen-sprite.png') -42px 1px no-repeat
-      &:hover
-        background-position: -42px -10px
+  .chzn-single span
+    margin-right: 26px
+    display: block
+    overflow: hidden
+    white-space: nowrap
+    -o-text-overflow: ellipsis
+    -ms-text-overflow: ellipsis
+    text-overflow: ellipsis
+  .chzn-single-with-deselect span
+    margin-right: 38px
+  .chzn-single abbr
+    display: block
+    position: absolute
+    right: 26px
+    top: 6px
+    width: 12px
+    height: 12px
+    font-size: 1px
+    background: image-url('chosen-sprite.png') -42px 1px no-repeat
+    &:hover
+      background-position: -42px -10px
   &.chzn-disabled .chzn-single abbr:hover
     background-position: -42px -10px
   .chzn-single div
@@ -259,6 +260,12 @@
   .active-result
     cursor: pointer
     display: list-item
+  .disabled-result
+    color: #ccc
+    cursor: default
+    display: list-item
+    em
+      background: transparent
   .highlighted
     background-color: #3875d7
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3875d7', endColorstr='#2a62bc', GradientType=0 )
@@ -284,7 +291,11 @@
     padding-left: 15px
 
 .chzn-container-multi .chzn-drop .result-selected
-  display: none
+  color: #ccc
+  cursor: default
+  display: list-item
+  em
+    background: transparent
 
 .chzn-container
   .chzn-results-scroll
@@ -369,6 +380,9 @@
       margin-left: 26px
       margin-right: 0
       direction: rtl
+  .chzn-single-with-deselect span
+    margin-left: 38px
+  .chzn-single
     div
       left: 3px
       right: auto
@@ -386,11 +400,7 @@
       .search-choice-close
         left: 4px
         right: auto
-  .chzn-search
-    left: 9999px
-  &.chzn-with-drop .chzn-search
-    left: 0px
-  .chzn-drop
+  .chzn-container-single-nosearch .chzn-search, .chzn-drop
     left: 9999px
   &.chzn-container-single .chzn-results
     margin: 0 0 4px 4px

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chosen-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.10.0
 platform: ruby
 authors:
 - Tse-Ching Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties