chosen-rails 0.13.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63c4381ea016723a73d951f117d1e29829fd0f9
-  data.tar.gz: fdfd7ad68bd5df045917bf113ad716772ef5fa0b
+  metadata.gz: c5812584c5181aa451334406808d07978d251851
+  data.tar.gz: 43f40dbd823a2b44b34ad12d8b93a4f05919965f
 SHA512:
-  metadata.gz: a803abd4ea21aee231b49e5ac11238d62455fcafb2994278d8d735823a219a0feedd60cf855f38ef1ba63ac90073f9555053515f8f7408bdc9ac4e5c8b9e4614
-  data.tar.gz: b5617dba2330e8cc5434a80ac57019e81b5afbaaa50f7b6a6b709abb84456ba51ae73603cb00a269c1981bfd32dca02d0bb5b656820ee177c3f5f26b4ae8aa36
+  metadata.gz: 26248f3d19863fefb7d454f003f58f9a2d7eba1e3479198c0b0a7c57c8c18bbfa677026a2e7feccfee4503e6d59ec60e4a251a09d1087f7b4d75f4dd701f08af
+  data.tar.gz: 202143305a02bc84937d711c47cecc483477682ed6a1ca168d556c49d39666dc91d8e8bb710afda596c74672ad1a77bbb5dedbaa032885dc8ef51f92009a8901

data/README.md

@@ -12,6 +12,14 @@ Include `chosen-rails` in Gemefile
 
     gem 'chosen-rails'
 
+For Rails 4 project, it is required to add [compass-rails](https://github.com/Compass/compass-rails) gem explicitly and use unofficial branch for [compatible issue](https://github.com/Compass/compass-rails/pull/59).
+
+
+```ruby
+# gem 'compass-rails', github: 'Compass/compass-rails', branch: 'rails4'
+gem 'compass-rails', github: 'milgner/compass-rails', branch: 'rails4'
+```
+
 Then run `bundle install`
 
 ### Include chosen javascript assets
@@ -36,7 +44,7 @@ Add to one coffee script file, like `scaffold.js.coffee`
 
     $ ->
       # enable chosen js
-      $('.chzn-select').chosen
+      $('.chosen-select').chosen
         allow_single_deselect: true
         no_results_text: 'No results matched'
         width: '200px'
@@ -53,7 +61,7 @@ Also add the class to your form field
     <%= f.select :author,
       User.all.map { |u| [u.name, u.id] },
       { include_blank: true },
-      { class: 'chzn-select' }
+      { class: 'chosen-select' }
     %>
 
 If you use simple form as form builder
@@ -61,7 +69,7 @@ If you use simple form as form builder
     <%= f.association :author,
       collection: User.all,
       include_blank: true,
-      input_html: { class: 'chzn-select' }
+      input_html: { class: 'chosen-select' }
     %>
 
 ### Deployment

data/Rakefile

@@ -8,5 +8,6 @@ task 'update-chosen', 'remote', 'branch' do |task, args|
   branch = args['branch'] || 'master'
   files = SourceFile.new
   files.fetch remote, branch
+  files.eject_javascript_class_from_closure
   files.cleanup
 end

data/lib/chosen-rails/source_file.rb

@@ -18,6 +18,19 @@ class SourceFile < Thor
     bump_version
   end
 
+  desc 'eject class from closure', 'eject javascript library class from closure'
+  def eject_javascript_class_from_closure
+    self.destination_root = 'vendor/assets'
+    inside destination_root do
+      append_to_file 'javascripts/lib/abstract-chosen.coffee' do
+        "\nwindow.AbstractChosen = AbstractChosen\n"
+      end
+      append_to_file 'javascripts/lib/select-parser.coffee' do
+        "\n\nwindow.SelectParser = SelectParser\n"
+      end
+    end
+  end
+
   desc 'clean up useless files', 'clean up useless files'
   def cleanup
     self.destination_root = 'vendor/assets'

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = '0.13.2'
-    CHOSEN_VERSION = '0.13.0'
+    VERSION = '1.0.0'
+    CHOSEN_VERSION = '1.0.0'
   end
 end

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

@@ -1,4 +1,3 @@
-root = this
 $ = jQuery
 
 $.fn.extend({
@@ -6,10 +5,16 @@ $.fn.extend({
     # 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 unless AbstractChosen.browser_is_supported()
-    this.each((input_field) ->
+    this.each (input_field) ->
       $this = $ this
-      $this.data('chosen', new Chosen(this, options)) unless $this.hasClass "chzn-done"
-    )
+      chosen = $this.data('chosen')
+      if options is 'destroy' && chosen
+        chosen.destroy()
+      else unless chosen
+        $this.data('chosen', new Chosen(this, options))
+
+      return
+
 })
 
 class Chosen extends AbstractChosen
@@ -17,88 +22,98 @@ class Chosen extends AbstractChosen
   setup: ->
     @form_field_jq = $ @form_field
     @current_selectedIndex = @form_field.selectedIndex
-    @is_rtl = @form_field_jq.hasClass "chzn-rtl"
-
-  finish_setup: ->
-    @form_field_jq.addClass "chzn-done"
+    @is_rtl = @form_field_jq.hasClass "chosen-rtl"
 
   set_up_html: ->
-    container_classes = ["chzn-container"]
-    container_classes.push "chzn-container-" + (if @is_multiple then "multi" else "single")
+    container_classes = ["chosen-container"]
+    container_classes.push "chosen-container-" + (if @is_multiple then "multi" else "single")
     container_classes.push @form_field.className if @inherit_select_classes && @form_field.className
-    container_classes.push "chzn-rtl" if @is_rtl
+    container_classes.push "chosen-rtl" if @is_rtl
 
     container_props =
       'class': container_classes.join ' '
       'style': "width: #{this.container_width()};"
       'title': @form_field.title
 
-    container_props.id = @form_field.id.replace(/[^\w]/g, '_') + "_chzn" if @form_field.id.length
+    container_props.id = @form_field.id.replace(/[^\w]/g, '_') + "_chosen" if @form_field.id.length
 
     @container = ($ "<div />", container_props)
 
     if @is_multiple
-      @container.html '<ul class="chzn-choices"><li class="search-field"><input type="text" value="' + @default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop"><ul class="chzn-results"></ul></div>'
+      @container.html '<ul class="chosen-choices"><li class="search-field"><input type="text" value="' + @default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>'
     else
-      @container.html '<a href="javascript:void(0)" class="chzn-single chzn-default" tabindex="-1"><span>' + @default_text + '</span><div><b></b></div></a><div class="chzn-drop"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'
+      @container.html '<a class="chosen-single chosen-default" tabindex="-1"><span>' + @default_text + '</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>'
 
     @form_field_jq.hide().after @container
-    @dropdown = @container.find('div.chzn-drop').first()
+    @dropdown = @container.find('div.chosen-drop').first()
 
     @search_field = @container.find('input').first()
-    @search_results = @container.find('ul.chzn-results').first()
+    @search_results = @container.find('ul.chosen-results').first()
     this.search_field_scale()
 
     @search_no_results = @container.find('li.no-results').first()
 
     if @is_multiple
-      @search_choices = @container.find('ul.chzn-choices').first()
+      @search_choices = @container.find('ul.chosen-choices').first()
       @search_container = @container.find('li.search-field').first()
     else
-      @search_container = @container.find('div.chzn-search').first()
-      @selected_item = @container.find('.chzn-single').first()
+      @search_container = @container.find('div.chosen-search').first()
+      @selected_item = @container.find('.chosen-single').first()
     
     this.results_build()
     this.set_tab_index()
     this.set_label_behavior()
-    @form_field_jq.trigger("liszt:ready", {chosen: this})
+    @form_field_jq.trigger("chosen:ready", {chosen: this})
 
   register_observers: ->
-    @container.mousedown (evt) => this.container_mousedown(evt); return
-    @container.mouseup (evt) => this.container_mouseup(evt); return
-    @container.mouseenter (evt) => this.mouse_enter(evt); return
-    @container.mouseleave (evt) => this.mouse_leave(evt); return
+    @container.bind 'mousedown.chosen', (evt) => this.container_mousedown(evt); return
+    @container.bind 'mouseup.chosen', (evt) => this.container_mouseup(evt); return
+    @container.bind 'mouseenter.chosen', (evt) => this.mouse_enter(evt); return
+    @container.bind 'mouseleave.chosen', (evt) => this.mouse_leave(evt); return
+
+    @search_results.bind 'mouseup.chosen', (evt) => this.search_results_mouseup(evt); return
+    @search_results.bind 'mouseover.chosen', (evt) => this.search_results_mouseover(evt); return
+    @search_results.bind 'mouseout.chosen', (evt) => this.search_results_mouseout(evt); return
+    @search_results.bind 'mousewheel.chosen DOMMouseScroll.chosen', (evt) => this.search_results_mousewheel(evt); return
 
-    @search_results.mouseup (evt) => this.search_results_mouseup(evt); return
-    @search_results.mouseover (evt) => this.search_results_mouseover(evt); return
-    @search_results.mouseout (evt) => this.search_results_mouseout(evt); return
-    @search_results.bind 'mousewheel DOMMouseScroll', (evt) => this.search_results_mousewheel(evt); return
+    @search_results.bind 'touchstart.chosen', (evt) => this.search_results_touchstart(evt); return
+    @search_results.bind 'touchmove.chosen', (evt) => this.search_results_touchmove(evt); return
+    @search_results.bind 'touchend.chosen', (evt) => this.search_results_touchend(evt); return
 
-    @form_field_jq.bind "liszt:updated", (evt) => this.results_update_field(evt); return
-    @form_field_jq.bind "liszt:activate", (evt) => this.activate_field(evt); return
-    @form_field_jq.bind "liszt:open", (evt) => this.container_mousedown(evt); return
+    @form_field_jq.bind "chosen:updated.chosen", (evt) => this.results_update_field(evt); return
+    @form_field_jq.bind "chosen:activate.chosen", (evt) => this.activate_field(evt); return
+    @form_field_jq.bind "chosen:open.chosen", (evt) => this.container_mousedown(evt); return
 
-    @search_field.blur (evt) => this.input_blur(evt); return
-    @search_field.keyup (evt) => this.keyup_checker(evt); return
-    @search_field.keydown (evt) => this.keydown_checker(evt); return
-    @search_field.focus (evt) => this.input_focus(evt); return
+    @search_field.bind 'blur.chosen', (evt) => this.input_blur(evt); return
+    @search_field.bind 'keyup.chosen', (evt) => this.keyup_checker(evt); return
+    @search_field.bind 'keydown.chosen', (evt) => this.keydown_checker(evt); return
+    @search_field.bind 'focus.chosen', (evt) => this.input_focus(evt); return
 
     if @is_multiple
-      @search_choices.click (evt) => this.choices_click(evt); return
+      @search_choices.bind 'click.chosen', (evt) => this.choices_click(evt); return
     else
-      @container.click (evt) => evt.preventDefault(); return # gobble click of anchor
+      @container.bind 'click.chosen', (evt) -> evt.preventDefault(); return # gobble click of anchor
+
+  destroy: ->
+    $(document).unbind "click.chosen", @click_test_action
+    if @search_field[0].tabIndex
+      @form_field_jq[0].tabIndex = @search_field[0].tabIndex
+
+    @container.remove()
+    @form_field_jq.removeData('chosen')
+    @form_field_jq.show()
 
   search_field_disabled: ->
     @is_disabled = @form_field_jq[0].disabled
     if(@is_disabled)
-      @container.addClass 'chzn-disabled'
+      @container.addClass 'chosen-disabled'
       @search_field[0].disabled = true
-      @selected_item.unbind "focus", @activate_action if !@is_multiple
+      @selected_item.unbind "focus.chosen", @activate_action if !@is_multiple
       this.close_field()
     else
-      @container.removeClass 'chzn-disabled'
+      @container.removeClass 'chosen-disabled'
       @search_field[0].disabled = false
-      @selected_item.bind "focus", @activate_action if !@is_multiple
+      @selected_item.bind "focus.chosen", @activate_action if !@is_multiple
 
   container_mousedown: (evt) ->
     if !@is_disabled
@@ -108,9 +123,9 @@ class Chosen extends AbstractChosen
       if not (evt? and ($ evt.target).hasClass "search-choice-close")
         if not @active_field
           @search_field.val "" if @is_multiple
-          $(document).click @click_test_action
+          $(document).bind 'click.chosen', @click_test_action
           this.results_show()
-        else if not @is_multiple and evt and (($(evt.target)[0] == @selected_item[0]) || $(evt.target).parents("a.chzn-single").length)
+        else if not @is_multiple and evt and (($(evt.target)[0] == @selected_item[0]) || $(evt.target).parents("a.chosen-single").length)
           evt.preventDefault()
           this.results_toggle()
 
@@ -127,22 +142,22 @@ class Chosen extends AbstractChosen
       @search_results.scrollTop(delta + @search_results.scrollTop())
 
   blur_test: (evt) ->
-    this.close_field() if not @active_field and @container.hasClass "chzn-container-active"
+    this.close_field() if not @active_field and @container.hasClass "chosen-container-active"
 
   close_field: ->
-    $(document).unbind "click", @click_test_action
+    $(document).unbind "click.chosen", @click_test_action
 
     @active_field = false
     this.results_hide()
 
-    @container.removeClass "chzn-container-active"
+    @container.removeClass "chosen-container-active"
     this.clear_backstroke()
 
     this.show_search_field_default()
     this.search_field_scale()
 
   activate_field: ->
-    @container.addClass "chzn-container-active"
+    @container.addClass "chosen-container-active"
     @active_field = true
 
     @search_field.val(@search_field.val())
@@ -150,7 +165,7 @@ class Chosen extends AbstractChosen
 
 
   test_active_click: (evt) ->
-    if @container.is($(evt.target).closest('.chzn-container'))
+    if @container.is($(evt.target).closest('.chosen-container'))
       @active_field = true
     else
       this.close_field()
@@ -159,7 +174,7 @@ class Chosen extends AbstractChosen
     @parsing = true
     @selected_option_count = null
 
-    @results_data = root.SelectParser.select_to_array @form_field
+    @results_data = SelectParser.select_to_array @form_field
 
     if @is_multiple
       @search_choices.find("li.search-choice").remove()
@@ -167,10 +182,10 @@ class Chosen extends AbstractChosen
       this.single_set_selected_text()
       if @disable_search or @form_field.options.length <= @disable_search_threshold
         @search_field[0].readOnly = true
-        @container.addClass "chzn-container-single-nosearch"
+        @container.addClass "chosen-container-single-nosearch"
       else
         @search_field[0].readOnly = false
-        @container.removeClass "chzn-container-single-nosearch"
+        @container.removeClass "chosen-container-single-nosearch"
 
     this.update_results_content this.results_option_build({first:true})
 
@@ -205,11 +220,11 @@ class Chosen extends AbstractChosen
 
   results_show: ->
     if @is_multiple and @max_selected_options <= this.choices_count()
-      @form_field_jq.trigger("liszt:maxselected", {chosen: this})
+      @form_field_jq.trigger("chosen:maxselected", {chosen: this})
       return false
 
-    @container.addClass "chzn-with-drop"
-    @form_field_jq.trigger("liszt:showing_dropdown", {chosen: this})
+    @container.addClass "chosen-with-drop"
+    @form_field_jq.trigger("chosen:showing_dropdown", {chosen: this})
 
     @results_showing = true
 
@@ -225,17 +240,17 @@ class Chosen extends AbstractChosen
     if @results_showing
       this.result_clear_highlight()
 
-      @container.removeClass "chzn-with-drop"
-      @form_field_jq.trigger("liszt:hiding_dropdown", {chosen: this})
+      @container.removeClass "chosen-with-drop"
+      @form_field_jq.trigger("chosen:hiding_dropdown", {chosen: this})
 
     @results_showing = false
 
 
   set_tab_index: (el) ->
-    if @form_field_jq.attr "tabindex"
-      ti = @form_field_jq.attr "tabindex"
-      @form_field_jq.attr "tabindex", -1
-      @search_field.attr "tabindex", ti
+    if @form_field.tabIndex
+      ti = @form_field.tabIndex
+      @form_field.tabIndex = -1
+      @search_field[0].tabIndex = ti
 
   set_label_behavior: ->
     @form_field_label = @form_field_jq.parents("label") # first check for a parent label
@@ -243,7 +258,7 @@ class Chosen extends AbstractChosen
       @form_field_label = $("label[for='#{@form_field.id}']") #next check for a for=#{id}
 
     if @form_field_label.length > 0
-      @form_field_label.click (evt) => if @is_multiple then this.container_mousedown(evt) else this.activate_field()
+      @form_field_label.bind 'click.chosen', (evt) => if @is_multiple then this.container_mousedown(evt) else this.activate_field()
 
   show_search_field_default: ->
     if @is_multiple and this.choices_count() < 1 and not @active_field
@@ -273,8 +288,8 @@ class Chosen extends AbstractChosen
     if item.disabled
       choice.addClass 'search-choice-disabled'
     else
-      close_link = $('<a />', { href: '#', class: 'search-choice-close',  rel: item.array_index })
-      close_link.click (evt) => this.choice_destroy_link_click(evt)
+      close_link = $('<a />', { class: 'search-choice-close', 'data-option-array-index': item.array_index })
+      close_link.bind 'click.chosen', (evt) => this.choice_destroy_link_click(evt)
       choice.append close_link
     
     @search_container.before  choice
@@ -285,7 +300,7 @@ class Chosen extends AbstractChosen
     this.choice_destroy $(evt.target) unless @is_disabled
 
   choice_destroy: (link) ->
-    if this.result_deselect (link.attr "rel")
+    if this.result_deselect( link[0].getAttribute("data-option-array-index") )
       this.show_search_field_default()
 
       this.results_hide() if @is_multiple and this.choices_count() > 0 and @search_field.val().length < 1
@@ -314,13 +329,17 @@ class Chosen extends AbstractChosen
       this.result_clear_highlight()
 
       if @is_multiple and @max_selected_options <= this.choices_count()
-        @form_field_jq.trigger("liszt:maxselected", {chosen: this})
+        @form_field_jq.trigger("chosen:maxselected", {chosen: this})
         return false
 
       if @is_multiple
         high.removeClass("active-result")
       else
-        @search_results.find(".result-selected").removeClass "result-selected"
+        if @result_single_selected
+          @result_single_selected.removeClass("result-selected")
+          selected_index = @result_single_selected[0].getAttribute('data-option-array-index')
+          @results_data[selected_index].selected = false
+
         @result_single_selected = high
 
       high.addClass "result-selected"
@@ -346,10 +365,10 @@ class Chosen extends AbstractChosen
 
   single_set_selected_text: (text=@default_text) ->
     if text is @default_text
-      @selected_item.addClass("chzn-default")
+      @selected_item.addClass("chosen-default")
     else
       this.single_deselect_control_build()
-      @selected_item.removeClass("chzn-default")
+      @selected_item.removeClass("chosen-default")
 
     @selected_item.find("span").text(text)
 
@@ -375,7 +394,7 @@ class Chosen extends AbstractChosen
   single_deselect_control_build: ->
     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")
+    @selected_item.addClass("chosen-single-with-deselect")
 
   get_search_text: ->
     if @search_field.val() is @default_text then "" else $('<div/>').text($.trim(@search_field.val())).html()
@@ -482,5 +501,3 @@ class Chosen extends AbstractChosen
         w = f_width - 10
 
       @search_field.css({'width': w + 'px'})
-
-root.Chosen = Chosen

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

@@ -1,57 +1,52 @@
-root = this
-
-class Chosen extends AbstractChosen
+class @Chosen extends AbstractChosen
 
   setup: ->
     @current_selectedIndex = @form_field.selectedIndex
-    @is_rtl = @form_field.hasClassName "chzn-rtl"
-
-  finish_setup: ->
-    @form_field.addClassName "chzn-done"
+    @is_rtl = @form_field.hasClassName "chosen-rtl"
 
   set_default_values: ->
     super()
 
     # HTML Templates
-    @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"><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"><ul class="chzn-results"></ul></div>')
+    @single_temp = new Template('<a class="chosen-single chosen-default" tabindex="-1"><span>#{default}</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>')
+    @multi_temp = new Template('<ul class="chosen-choices"><li class="search-field"><input type="text" value="#{default}" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>')
     @no_results_temp = new Template('<li class="no-results">' + @results_none_found + ' "<span>#{terms}</span>"</li>')
 
   set_up_html: ->
-    container_classes = ["chzn-container"]
-    container_classes.push "chzn-container-" + (if @is_multiple then "multi" else "single")
+    container_classes = ["chosen-container"]
+    container_classes.push "chosen-container-" + (if @is_multiple then "multi" else "single")
     container_classes.push @form_field.className if @inherit_select_classes && @form_field.className
-    container_classes.push "chzn-rtl" if @is_rtl
+    container_classes.push "chosen-rtl" if @is_rtl
 
     container_props =
       'class': container_classes.join ' '
       'style': "width: #{this.container_width()};"
       'title': @form_field.title
 
-    container_props.id = @form_field.id.replace(/[^\w]/g, '_') + "_chzn" if @form_field.id.length
+    container_props.id = @form_field.id.replace(/[^\w]/g, '_') + "_chosen" if @form_field.id.length
 
     @container = 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: @container })
-    @dropdown = @container.down('div.chzn-drop')
+    @dropdown = @container.down('div.chosen-drop')
 
     @search_field = @container.down('input')
-    @search_results = @container.down('ul.chzn-results')
+    @search_results = @container.down('ul.chosen-results')
     this.search_field_scale()
 
     @search_no_results = @container.down('li.no-results')
 
     if @is_multiple
-      @search_choices = @container.down('ul.chzn-choices')
+      @search_choices = @container.down('ul.chosen-choices')
       @search_container = @container.down('li.search-field')
     else
-      @search_container = @container.down('div.chzn-search')
-      @selected_item = @container.down('.chzn-single')
+      @search_container = @container.down('div.chosen-search')
+      @selected_item = @container.down('.chosen-single')
 
     this.results_build()
     this.set_tab_index()
     this.set_label_behavior()
-    @form_field.fire("liszt:ready", {chosen: this})
+    @form_field.fire("chosen:ready", {chosen: this})
 
   register_observers: ->
     @container.observe "mousedown", (evt) => this.container_mousedown(evt)
@@ -65,9 +60,13 @@ class Chosen extends AbstractChosen
     @search_results.observe "mousewheel", (evt) => this.search_results_mousewheel(evt)
     @search_results.observe "DOMMouseScroll", (evt) => this.search_results_mousewheel(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_results.observe "touchstart", (evt) => this.search_results_touchstart(evt)
+    @search_results.observe "touchmove", (evt) => this.search_results_touchmove(evt)
+    @search_results.observe "touchend", (evt) => this.search_results_touchend(evt)
+
+    @form_field.observe "chosen:updated", (evt) => this.results_update_field(evt)
+    @form_field.observe "chosen:activate", (evt) => this.activate_field(evt)
+    @form_field.observe "chosen:open", (evt) => this.container_mousedown(evt)
 
     @search_field.observe "blur", (evt) => this.input_blur(evt)
     @search_field.observe "keyup", (evt) => this.keyup_checker(evt)
@@ -79,15 +78,37 @@ class Chosen extends AbstractChosen
     else
       @container.observe "click", (evt) => evt.preventDefault() # gobble click of anchor
 
+  destroy: ->
+    document.stopObserving "click", @click_test_action
+
+    @form_field.stopObserving()
+    @container.stopObserving()
+    @search_results.stopObserving()
+    @search_field.stopObserving()
+    @form_field_label.stopObserving() if @form_field_label?
+
+    if @is_multiple
+      @search_choices.stopObserving()
+      @container.select(".search-choice-close").each (choice) ->
+        choice.stopObserving()
+    else
+      @selected_item.stopObserving() 
+
+    if @search_field.tabIndex
+      @form_field.tabIndex = @search_field.tabIndex
+
+    @container.remove()
+    @form_field.show()
+
   search_field_disabled: ->
     @is_disabled = @form_field.disabled
     if(@is_disabled)
-      @container.addClassName 'chzn-disabled'
+      @container.addClassName 'chosen-disabled'
       @search_field.disabled = true
       @selected_item.stopObserving "focus", @activate_action if !@is_multiple
       this.close_field()
     else
-      @container.removeClassName 'chzn-disabled'
+      @container.removeClassName 'chosen-disabled'
       @search_field.disabled = false
       @selected_item.observe "focus", @activate_action if !@is_multiple
 
@@ -101,7 +122,7 @@ class Chosen extends AbstractChosen
           @search_field.clear() if @is_multiple
           document.observe "click", @click_test_action
           this.results_show()
-        else if not @is_multiple and evt and (evt.target is @selected_item || evt.target.up("a.chzn-single"))
+        else if not @is_multiple and evt and (evt.target is @selected_item || evt.target.up("a.chosen-single"))
           this.results_toggle()
 
         this.activate_field()
@@ -117,7 +138,7 @@ class Chosen extends AbstractChosen
       @search_results.scrollTop = delta + @search_results.scrollTop
 
   blur_test: (evt) ->
-    this.close_field() if not @active_field and @container.hasClassName("chzn-container-active")
+    this.close_field() if not @active_field and @container.hasClassName("chosen-container-active")
 
   close_field: ->
     document.stopObserving "click", @click_test_action
@@ -125,21 +146,21 @@ class Chosen extends AbstractChosen
     @active_field = false
     this.results_hide()
 
-    @container.removeClassName "chzn-container-active"
+    @container.removeClassName "chosen-container-active"
     this.clear_backstroke()
 
     this.show_search_field_default()
     this.search_field_scale()
 
   activate_field: ->
-    @container.addClassName "chzn-container-active"
+    @container.addClassName "chosen-container-active"
     @active_field = true
 
     @search_field.value = @search_field.value
     @search_field.focus()
 
   test_active_click: (evt) ->
-    if evt.target.up('.chzn-container') is @container
+    if evt.target.up('.chosen-container') is @container
       @active_field = true
     else
       this.close_field()
@@ -148,7 +169,7 @@ class Chosen extends AbstractChosen
     @parsing = true
     @selected_option_count = null
 
-    @results_data = root.SelectParser.select_to_array @form_field
+    @results_data = SelectParser.select_to_array @form_field
 
     if @is_multiple
       @search_choices.select("li.search-choice").invoke("remove")
@@ -156,10 +177,10 @@ class Chosen extends AbstractChosen
       this.single_set_selected_text()
       if @disable_search or @form_field.options.length <= @disable_search_threshold
         @search_field.readOnly = true
-        @container.addClassName "chzn-container-single-nosearch"
+        @container.addClassName "chosen-container-single-nosearch"
       else
         @search_field.readOnly = false
-        @container.removeClassName "chzn-container-single-nosearch"
+        @container.removeClassName "chosen-container-single-nosearch"
 
     this.update_results_content this.results_option_build({first:true})
 
@@ -193,11 +214,11 @@ class Chosen extends AbstractChosen
 
   results_show: ->
     if @is_multiple and @max_selected_options <= this.choices_count()
-      @form_field.fire("liszt:maxselected", {chosen: this})
+      @form_field.fire("chosen:maxselected", {chosen: this})
       return false
 
-    @container.addClassName "chzn-with-drop"
-    @form_field.fire("liszt:showing_dropdown", {chosen: this})
+    @container.addClassName "chosen-with-drop"
+    @form_field.fire("chosen:showing_dropdown", {chosen: this})
 
     @results_showing = true
 
@@ -213,8 +234,8 @@ class Chosen extends AbstractChosen
     if @results_showing
       this.result_clear_highlight()
 
-      @container.removeClassName "chzn-with-drop"
-      @form_field.fire("liszt:hiding_dropdown", {chosen: this})
+      @container.removeClassName "chosen-with-drop"
+      @form_field.fire("chosen:hiding_dropdown", {chosen: this})
 
     @results_showing = false
 
@@ -302,13 +323,17 @@ class Chosen extends AbstractChosen
       this.result_clear_highlight()
 
       if @is_multiple and @max_selected_options <= this.choices_count()
-        @form_field.fire("liszt:maxselected", {chosen: this})
+        @form_field.fire("chosen:maxselected", {chosen: this})
         return false
 
       if @is_multiple
         high.removeClassName("active-result")
       else
-        @search_results.descendants(".result-selected").invoke "removeClassName", "result-selected"
+        if @result_single_selected
+          @result_single_selected.removeClassName("result-selected")
+          selected_index = @result_single_selected.getAttribute('data-option-array-index')
+          @results_data[selected_index].selected = false
+
         @result_single_selected = high
       
       high.addClassName("result-selected")
@@ -335,10 +360,10 @@ class Chosen extends AbstractChosen
 
   single_set_selected_text: (text=@default_text) ->
     if text is @default_text
-      @selected_item.addClassName("chzn-default")
+      @selected_item.addClassName("chosen-default")
     else
       this.single_deselect_control_build()
-      @selected_item.removeClassName("chzn-default")
+      @selected_item.removeClassName("chosen-default")
 
     @selected_item.down("span").update(text)
 
@@ -363,7 +388,7 @@ class Chosen extends AbstractChosen
   single_deselect_control_build: ->
     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")
+    @selected_item.addClassName("chosen-single-with-deselect")
 
   get_search_text: ->
     if @search_field.value is @default_text then "" else @search_field.value.strip().escapeHTML()
@@ -473,5 +498,3 @@ class Chosen extends AbstractChosen
         w = f_width - 10
 
       @search_field.setStyle({'width': w + 'px'})
-
-root.Chosen = Chosen

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

@@ -1,5 +1,3 @@
-root = this
-
 class AbstractChosen
 
   constructor: (@form_field, @options={}) ->
@@ -13,8 +11,6 @@ class AbstractChosen
     this.set_up_html()
     this.register_observers()
 
-    this.finish_setup()
-
   set_default_values: ->
     @click_test_action = (evt) => this.test_active_click(evt)
     @activate_action = (evt) => this.activate_field(evt)
@@ -32,6 +28,8 @@ class AbstractChosen
     @single_backstroke_delete = if @options.single_backstroke_delete? then @options.single_backstroke_delete else true
     @max_selected_options = @options.max_selected_options || Infinity
     @inherit_select_classes = @options.inherit_select_classes || false
+    @display_selected_options = if @options.display_selected_options? then @options.display_selected_options else true
+    @display_disabled_options = if @options.display_disabled_options? then @options.display_disabled_options else true
 
   set_default_text: ->
     if @form_field.getAttribute("data-placeholder")
@@ -60,9 +58,9 @@ class AbstractChosen
   results_option_build: (options) ->
     content = ''
     for data in @results_data
-      if data.group && (data.search_match || data.group_match)
+      if data.group
         content += this.result_add_group data
-      else if !data.empty && data.search_match
+      else
         content += this.result_add_option data
 
       # this select logic pins on an awkward flag
@@ -76,6 +74,9 @@ class AbstractChosen
     content
 
   result_add_option: (option) ->
+    return '' unless option.search_match
+    return '' unless this.include_option_in_results(option)
+
     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)
@@ -83,12 +84,23 @@ class AbstractChosen
     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 ""
+    option_el = document.createElement("li")
+    option_el.className = classes.join(" ")
+    option_el.style.cssText = option.style
+    option_el.setAttribute("data-option-array-index", option.array_index)
+    option_el.innerHTML = option.search_text
 
-    """<li class="#{classes.join(' ')}"#{style} data-option-array-index="#{option.array_index}">#{option.search_text}</li>"""
+    this.outerHTML(option_el)
 
   result_add_group: (group) ->
-    """<li class="group-result">#{group.search_text}</li>"""
+    return '' unless group.search_match || group.group_match
+    return '' unless group.active_options > 0
+
+    group_el = document.createElement("li")
+    group_el.className = "group-result"
+    group_el.innerHTML = group.search_text
+
+    this.outerHTML(group_el)
 
   results_update_field: ->
     this.set_default_text()
@@ -116,21 +128,32 @@ class AbstractChosen
     results = 0
 
     searchText = this.get_search_text()
+    escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")
     regexAnchor = if @search_contains then "" else "^"
-    regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
-    zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
+    regex = new RegExp(regexAnchor + escapedSearchText, 'i')
+    zregex = new RegExp(escapedSearchText, 'i')
 
     for option in @results_data
-      if not option.empty
 
-        option.group_match = false if option.group
+      option.search_match = false
+      results_group = null
 
+      if this.include_option_in_results(option)
+
+        if option.group
+          option.group_match = false
+          option.active_options = 0
+
+        if option.group_array_index? and @results_data[option.group_array_index]
+          results_group = @results_data[option.group_array_index]
+          results += 1 if results_group.active_options is 0 and results_group.search_match
+          results_group.active_options += 1
+                
         unless option.group and not @group_search
-          option.search_match = false
 
           option.search_text = if option.group then option.label else option.html
           option.search_match = this.search_string_match(option.search_text, regex)
-          results += 1 if option.search_match
+          results += 1 if option.search_match and not option.group
 
           if option.search_match
             if searchText.length
@@ -138,14 +161,15 @@ class AbstractChosen
               text = option.search_text.substr(0, startpos + searchText.length) + '</em>' + option.search_text.substr(startpos + searchText.length)
               option.search_text = text.substr(0, startpos) + '<em>' + text.substr(startpos)
 
-            @results_data[option.group_array_index].group_match = true if option.group_array_index?
+            results_group.group_match = true if results_group?
           
           else if option.group_array_index? and @results_data[option.group_array_index].search_match
             option.search_match = true
 
+    this.result_clear_highlight()
+
     if results < 1 and searchText.length
       this.update_results_content ""
-      this.result_clear_highlight()
       this.no_results searchText
     else
       this.update_results_content this.results_option_build()
@@ -199,15 +223,44 @@ class AbstractChosen
   container_width: ->
     return if @options.width? then @options.width else "#{@form_field.offsetWidth}px"
 
+  include_option_in_results: (option) ->
+    return false if @is_multiple and (not @display_selected_options and option.selected)
+    return false if not @display_disabled_options and option.disabled
+    return false if option.empty
+
+    return true
+
+  search_results_touchstart: (evt) ->
+    @touch_started = true
+    this.search_results_mouseover(evt)
+
+  search_results_touchmove: (evt) ->
+    @touch_started = false
+    this.search_results_mouseout(evt)
+
+  search_results_touchend: (evt) ->
+    this.search_results_mouseup(evt) if @touch_started
+
+  outerHTML: (element) ->
+    return element.outerHTML if element.outerHTML
+    tmp = document.createElement("div")
+    tmp.appendChild(element)
+    tmp.innerHTML
+
   # class methods and variables ============================================================ 
 
   @browser_is_supported: ->
     if window.navigator.appName == "Microsoft Internet Explorer"
-      return null isnt document.documentMode >= 8
+      return document.documentMode >= 8
+    if /iP(od|hone)/i.test(window.navigator.userAgent)
+      return false
+    if /Android/i.test(window.navigator.userAgent)
+      return false if /Mobile/i.test(window.navigator.userAgent)
     return true
 
   @default_multiple_text: "Select Some Options"
   @default_single_text: "Select an Option"
   @default_no_result_text: "No results match"
 
-root.AbstractChosen = AbstractChosen
+
+window.AbstractChosen = AbstractChosen

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

@@ -63,4 +63,4 @@ SelectParser.select_to_array = (select) ->
   parser.add_node( child ) for child in select.childNodes
   parser.parsed
 
-this.SelectParser = SelectParser
+window.SelectParser = SelectParser

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

@@ -6,7 +6,7 @@ $chosen-sprite: image-url('chosen-sprite.png');
 $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
 
 /* @group Base */
-.chzn-container {
+.chosen-container {
   position: relative;
   display: inline-block;
   vertical-align: middle;
@@ -14,7 +14,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
   zoom: 1;
   *display: inline;
   @include user-select(none);
-  .chzn-drop {
+  .chosen-drop {
     position: absolute;
     top: 100%;
     left: -9999px;
@@ -26,15 +26,18 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
     background: #fff;
     box-shadow: 0 4px 5px rgba(#000,.15);
   }
-  &.chzn-with-drop .chzn-drop {
+  &.chosen-with-drop .chosen-drop {
     left: 0;
   }
+  a{
+    cursor: pointer;
+  }
 }
 /* @end */
 
 /* @group Single Chosen */
-.chzn-container-single{
-  .chzn-single {
+.chosen-container-single{
+  .chosen-single {
     position: relative;
     display: block;
     overflow: hidden;
@@ -51,20 +54,20 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
     white-space: nowrap;
     line-height: 24px;
   }
-  .chzn-default {
+  .chosen-default {
     color: #999;
   }
-  .chzn-single span {
+  .chosen-single span {
     display: block;
     overflow: hidden;
     margin-right: 26px;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  .chzn-single-with-deselect span {
+  .chosen-single-with-deselect span {
     margin-right: 38px;
   }
-  .chzn-single abbr {
+  .chosen-single abbr {
     position: absolute;
     top: 6px;
     right: 26px;
@@ -77,10 +80,10 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       background-position: -42px -10px;
     }
   }
-  &.chzn-disabled .chzn-single abbr:hover {
+  &.chosen-disabled .chosen-single abbr:hover {
     background-position: -42px -10px;
   }
-  .chzn-single div {
+  .chosen-single div {
     position: absolute;
     top: 0;
     right: 0;
@@ -94,7 +97,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       background: $chosen-sprite no-repeat 0px 2px;
     }
   }
-  .chzn-search {
+  .chosen-search {
     position: relative;
     z-index: 1010;
     margin: 0;
@@ -116,12 +119,12 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       border-radius: 0;
     }
   }
-  .chzn-drop {
+  .chosen-drop {
     margin-top: -1px;
     border-radius: 0 0 4px 4px;
     background-clip: padding-box;
   }
-  &.chzn-container-single-nosearch .chzn-search {
+  &.chosen-container-single-nosearch .chosen-search {
     position: absolute;
     left: -9999px;
   }
@@ -129,7 +132,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
 /* @end */
 
 /* @group Results */
-.chzn-container .chzn-results {
+.chosen-container .chosen-results {
   position: relative;
   overflow-x: hidden;
   overflow-y: auto;
@@ -143,6 +146,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
     padding: 5px 6px;
     list-style: none;
     line-height: 15px;
+    -webkit-touch-callout: none;
     &.active-result {
       display: list-item;
       cursor: pointer;
@@ -178,8 +182,8 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
 /* @end */
 
 /* @group Multi Chosen */
-.chzn-container-multi{
-  .chzn-choices {
+.chosen-container-multi{
+  .chosen-choices {
     position: relative;
     overflow: hidden;
     @include box-sizing(border-box);
@@ -193,7 +197,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
     @include background-image(linear-gradient(#eee 1%, #fff 15%));
     cursor: text;
   }
-  .chzn-choices li {
+  .chosen-choices li {
     float: left;
     list-style: none;
     &.search-field {
@@ -259,11 +263,11 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       }
     }
   }
-  .chzn-results {
+  .chosen-results {
     margin: 0;
     padding: 0;
   }
-  .chzn-drop .result-selected {
+  .chosen-drop .result-selected {
     display: list-item;
     color: #ccc;
     cursor: default;
@@ -272,13 +276,13 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
 /* @end */
 
 /* @group Active  */
-.chzn-container-active{
-  .chzn-single {
+.chosen-container-active{
+  .chosen-single {
     border: 1px solid #5897fb;
     box-shadow: 0 0 5px rgba(#000,.3);
   }
-  &.chzn-with-drop{
-    .chzn-single {
+  &.chosen-with-drop{
+    .chosen-single {
       border: 1px solid #aaa;
       -moz-border-radius-bottomright: 0;
       border-bottom-right-radius: 0;
@@ -287,7 +291,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       @include background-image(linear-gradient(#eee 20%, #fff 80%));
       box-shadow: 0 1px 0 #fff inset;
     }
-    .chzn-single div {
+    .chosen-single div {
       border-left: none;
       background: transparent;
       b {
@@ -295,7 +299,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       }
     }
   }
-  .chzn-choices {
+  .chosen-choices {
     border: 1px solid #5897fb;
     box-shadow: 0 0 5px rgba(#000,.3);
     li.search-field input[type="text"] {
@@ -306,42 +310,42 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
 /* @end */
 
 /* @group Disabled Support */
-.chzn-disabled {
+.chosen-disabled {
   opacity: 0.5 !important;
   cursor: default;
-  .chzn-single {
+  .chosen-single {
     cursor: default;
   }
-  .chzn-choices .search-choice .search-choice-close {
+  .chosen-choices .search-choice .search-choice-close {
     cursor: default;
   }
 }
 /* @end */
 
 /* @group Right to Left */
-.chzn-rtl {
+.chosen-rtl {
   text-align: right;
-  .chzn-single {
+  .chosen-single {
     overflow: visible;
     padding: 0 8px 0 0;
   }
-  .chzn-single span {
+  .chosen-single span {
     margin-right: 0;
     margin-left: 26px;
     direction: rtl;
   }
-  .chzn-single-with-deselect span {
+  .chosen-single-with-deselect span {
     margin-left: 38px;
   }
-  .chzn-single div {
+  .chosen-single div {
     right: auto;
     left: 3px;
   }
-  .chzn-single abbr {
+  .chosen-single abbr {
     right: auto;
     left: 26px;
   }
-  .chzn-choices li {
+  .chosen-choices li {
     float: right;
     &.search-field input[type="text"] {
       direction: rtl;
@@ -355,33 +359,33 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
       }
     }
   }
-  &.chzn-container-single-nosearch .chzn-search,
-  .chzn-drop {
+  &.chosen-container-single-nosearch .chosen-search,
+  .chosen-drop {
     left: 9999px;
   }
-  &.chzn-container-single .chzn-results {
+  &.chosen-container-single .chosen-results {
     margin: 0 0 4px 4px;
     padding: 0 4px 0 0;
   }
-  .chzn-results li.group-option {
+  .chosen-results li.group-option {
     padding-right: 15px;
     padding-left: 0;
   }
-  &.chzn-container-active.chzn-with-drop .chzn-single div {
+  &.chosen-container-active.chosen-with-drop .chosen-single div {
     border-right: none;
   }
-  .chzn-search input[type="text"] {
+  .chosen-search input[type="text"] {
     padding: 4px 5px 4px 20px;
     background: #fff $chosen-sprite no-repeat -30px -20px;
     @include background($chosen-sprite no-repeat -30px -20px, linear-gradient(#eee 1%, #fff 15%));
     direction: rtl;
   }
-  &.chzn-container-single{
-    .chzn-single div b {
+  &.chosen-container-single{
+    .chosen-single div b {
       background-position: 6px 2px;
     }
-    &.chzn-with-drop{
-      .chzn-single div b {
+    &.chosen-with-drop{
+      .chosen-single div b {
         background-position: -12px 2px;
       }
     }
@@ -392,13 +396,13 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png');
 
 /* @group Retina compatibility */
 @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi)  {
-  .chzn-rtl .chzn-search input[type="text"],
-  .chzn-container-single .chzn-single abbr,
-  .chzn-container-single .chzn-single div b,
-  .chzn-container-single .chzn-search input[type="text"],
-  .chzn-container-multi .chzn-choices .search-choice .search-choice-close,
-  .chzn-container .chzn-results-scroll-down span,
-  .chzn-container .chzn-results-scroll-up span {
+  .chosen-rtl .chosen-search input[type="text"],
+  .chosen-container-single .chosen-single abbr,
+  .chosen-container-single .chosen-single div b,
+  .chosen-container-single .chosen-search input[type="text"],
+  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+  .chosen-container .chosen-results-scroll-down span,
+  .chosen-container .chosen-results-scroll-up span {
     background-image: $chosen-sprite-retina !important;
     background-size: 52px 37px !important;
     background-repeat: no-repeat !important;

metadata

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