chosen-rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3509cebedbed2da25738b2bea9699477c0f7907
-  data.tar.gz: 1bdfe1a24a51d77fb648242cd894ce337e42eaea
+  metadata.gz: a00aed3e49a214127fe61ce7d78b31f490898af0
+  data.tar.gz: 5849a7c7fd0b0bf95e5a282555771f30cd175fee
 SHA512:
-  metadata.gz: b19b5169eeea9a1f3a91d263dffb15fa994efeeabca7892e19e8dd7c5d589ee864ca13cd85e691eb00b50267e1538f8ffd1f707d1e581b5feaf7347cf9422411
-  data.tar.gz: 3fc77fc57bc365b387507d4c2b3f89f5a7c47a40c844d2bd9e7b60a344ab14423f96233d0b73d75cb58cf9cd0b90f2a9eba576b81f79d7e892a97e8b401d9d9e
+  metadata.gz: 436778b889eb6341473da8452f60b33951d8415cbaf697322c63b799befc2ce37bbbce6910245e52624047cb7f2876ecea21c5ee4d57af64f9e2c8e9c0782222
+  data.tar.gz: d2c4efc81e654f3957fc647ad58771e9629910b2a5e7ace3fd92504d456c063df3bd5dff44a833662c3b26d6c314454a72673019eb164fac72d1ca59dcb8ec95

data/README.md

@@ -10,7 +10,9 @@ The `chosen-rails` gem integrates the `Chosen` with the Rails asset pipeline.
 
 Include `chosen-rails` in Gemefile
 
-    gem 'chosen-rails'
+```rb
+gem 'chosen-rails'
+```
 
 Then run `bundle install`
 
@@ -18,51 +20,65 @@ Then run `bundle install`
 
 Add to your `app/assets/javascripts/application.js` if use with jQuery
 
-    //= require chosen-jquery
+```coffee
+//= require chosen-jquery
+```
 
 Or with Prototype
 
-    //= require chosen-prototype
+```coffee
+//= require chosen-prototype
+```
 
 ### Include chosen stylesheet assets
 
 Add to your `app/assets/stylesheets/application.css`
 
-    *= require chosen
+```scss
+*= require chosen
+```
 
 ### Enable chosen javascript by specific css class
 
 Add to one coffee script file, like `scaffold.js.coffee`
 
-    $ ->
-      # enable chosen js
-      $('.chosen-select').chosen
-        allow_single_deselect: true
-        no_results_text: 'No results matched'
-        width: '200px'
+```coffee
+$ ->
+  # enable chosen js
+  $('.chosen-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`
 
-    //= require chosen-jquery
-    //= require scaffold
+```coffee
+//= require chosen-jquery
+//= require scaffold
+```
 
 Also add the class to your form field
 
-    <%= f.select :author,
-      User.all.map { |u| [u.name, u.id] },
-      { include_blank: true },
-      { class: 'chosen-select' }
-    %>
+```erb
+<%= f.select :author,
+  User.all.map { |u| [u.name, u.id] },
+               { include_blank: true },
+               { class: 'chosen-select' }
+%>
+```
 
 If you use simple form as form builder
 
-    <%= f.association :author,
-      collection: User.all,
-      include_blank: true,
-      input_html: { class: 'chosen-select' }
-    %>
+```erb
+<%= f.association :author, 
+                  collection: User.all,
+                  include_blank: true,
+                  input_html: { class: 'chosen-select' }
+%>
+```
 
 ### Deployment
 
@@ -74,11 +90,15 @@ Maintain `chosen-rails` gem with `Rake` commands.
 
 Update origin chosen source files.
 
-    rake update-chosen
+```bash
+rake update-chosen
+```
 
 Publish gem.
 
-    rake release
+```bash
+rake release
+```
 
 ## License
 

data/lib/chosen-rails/source_file.rb

@@ -9,7 +9,7 @@ class SourceFile < Thor
     self.destination_root = 'vendor/assets'
     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}/sass/chosen.scss", 'stylesheets/chosen.css.scss'
+    get "#{remote}/raw/#{branch}/sass/chosen.scss", 'stylesheets/chosen.scss'
     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'

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = '1.2.0'
-    CHOSEN_VERSION = '1.2.0'
+    VERSION = '1.3.0'
+    CHOSEN_VERSION = '1.3.0'
   end
 end

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

@@ -63,6 +63,8 @@ class Chosen extends AbstractChosen
     this.results_build()
     this.set_tab_index()
     this.set_label_behavior()
+
+  on_ready: ->
     @form_field_jq.trigger("chosen:ready", {chosen: this})
 
   register_observers: ->
@@ -289,7 +291,7 @@ class Chosen extends AbstractChosen
     this.result_clear_highlight() if $(evt.target).hasClass "active-result" or $(evt.target).parents('.active-result').first()
 
   choice_build: (item) ->
-    choice = $('<li />', { class: "search-choice" }).html("<span>#{item.html}</span>")
+    choice = $('<li />', { class: "search-choice" }).html("<span>#{this.choice_label(item)}</span>")
 
     if item.disabled
       choice.addClass 'search-choice-disabled'
@@ -352,7 +354,7 @@ class Chosen extends AbstractChosen
       if @is_multiple
         this.choice_build item
       else
-        this.single_set_selected_text(item.text)
+        this.single_set_selected_text(this.choice_label(item))
 
       this.results_hide() unless (evt.metaKey or evt.ctrlKey) and @is_multiple
 
@@ -369,7 +371,7 @@ class Chosen extends AbstractChosen
       this.single_deselect_control_build()
       @selected_item.removeClass("chosen-default")
 
-    @selected_item.find("span").text(text)
+    @selected_item.find("span").html(text)
 
   result_deselect: (pos) ->
     result_data = @results_data[pos]

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

@@ -46,6 +46,8 @@ class @Chosen extends AbstractChosen
     this.results_build()
     this.set_tab_index()
     this.set_label_behavior()
+
+  on_ready: ->
     @form_field.fire("chosen:ready", {chosen: this})
 
   register_observers: ->
@@ -282,7 +284,7 @@ class @Chosen extends AbstractChosen
     this.result_clear_highlight() if evt.target.hasClassName('active-result') or evt.target.up('.active-result')
 
   choice_build: (item) ->
-    choice = new Element('li', { class: "search-choice" }).update("<span>#{item.html}</span>")
+    choice = new Element('li', { class: "search-choice" }).update("<span>#{this.choice_label(item)}</span>")
 
     if item.disabled
       choice.addClassName 'search-choice-disabled'
@@ -347,7 +349,7 @@ class @Chosen extends AbstractChosen
       if @is_multiple
         this.choice_build item
       else
-        this.single_set_selected_text(item.text)
+        this.single_set_selected_text(this.choice_label(item))
 
       this.results_hide() unless (evt.metaKey or evt.ctrlKey) and @is_multiple
 

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

@@ -10,6 +10,8 @@ class AbstractChosen
 
     this.set_up_html()
     this.register_observers()
+    # instantiation done, fire ready
+    this.on_ready()
 
   set_default_values: ->
     @click_test_action = (evt) => this.test_active_click(evt)
@@ -29,6 +31,7 @@ class AbstractChosen
     @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
+    @include_group_label_in_selected = @options.include_group_label_in_selected || false
 
   set_default_text: ->
     if @form_field.getAttribute("data-placeholder")
@@ -40,6 +43,12 @@ class AbstractChosen
 
     @results_none_found = @form_field.getAttribute("data-no_results_text") || @options.no_results_text || AbstractChosen.default_no_result_text
 
+  choice_label: (item) ->
+    if @include_group_label_in_selected and item.group_label?
+      "<b class='group-name'>#{item.group_label}</b>#{item.html}"
+    else
+      item.html
+
   mouse_enter: -> @mouse_on_container = true
   mouse_leave: -> @mouse_on_container = false
 
@@ -95,8 +104,12 @@ class AbstractChosen
     return '' unless group.search_match || group.group_match
     return '' unless group.active_options > 0
 
+    classes = []
+    classes.push "group-result"
+    classes.push group.classes if group.classes
+
     group_el = document.createElement("li")
-    group_el.className = "group-result"
+    group_el.className = classes.join(" ")
     group_el.innerHTML = group.search_text
 
     this.outerHTML(group_el)

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

@@ -17,7 +17,8 @@ class SelectParser
       group: true
       label: this.escapeExpression(group.label)
       children: 0
-      disabled: group.disabled
+      disabled: group.disabled,
+      classes: group.className
     this.add_option( option, group_position, group.disabled ) for option in group.childNodes
 
   add_option: (option, group_position, group_disabled) ->
@@ -34,6 +35,7 @@ class SelectParser
           selected: option.selected
           disabled: if group_disabled is true then group_disabled else option.disabled
           group_array_index: group_position
+          group_label: if group_position? then @parsed[group_position].label else null
           classes: option.className
           style: option.style.cssText
       else
@@ -63,4 +65,5 @@ SelectParser.select_to_array = (select) ->
   parser.add_node( child ) for child in select.childNodes
   parser.parsed
 
+
 window.SelectParser = SelectParser

data/vendor/assets/stylesheets/{chosen.css.scss → chosen.scss}

@@ -34,6 +34,22 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png') !default;
   a{
     cursor: pointer;
   }
+  
+  .search-choice, .chosen-single{
+    .group-name{
+      margin-right: 4px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      font-weight: normal;
+      color: #999999;
+      &:after {
+        content: ":";
+        padding-left: 2px;
+        vertical-align: top;
+      }
+    }
+  }
 }
 /* @end */
 
@@ -401,7 +417,7 @@ $chosen-sprite-retina: image-url('chosen-sprite@2x.png') !default;
 /* @end */
 
 /* @group Retina compatibility */
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi)  {
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) {
   .chosen-rtl .chosen-search input[type="text"],
   .chosen-container-single .chosen-single abbr,
   .chosen-container-single .chosen-single div b,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chosen-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tse-Ching Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -137,7 +137,7 @@ files:
 - vendor/assets/javascripts/chosen.proto.coffee
 - vendor/assets/javascripts/lib/abstract-chosen.coffee
 - vendor/assets/javascripts/lib/select-parser.coffee
-- vendor/assets/stylesheets/chosen.css.scss
+- vendor/assets/stylesheets/chosen.scss
 homepage: https://github.com/tsechingho/chosen-rails
 licenses: []
 metadata: {}