Merge pull request #106 from i4a/bump-version

Bump version 1.8.7

Author: tsechingho

lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = '1.8.3'
-    CHOSEN_VERSION = '1.8.3'
+    VERSION = '1.8.7'
+    CHOSEN_VERSION = '1.8.7'
   end
 end

vendor/assets/javascripts/chosen.jquery.coffee

@@ -243,9 +243,6 @@ class Chosen extends AbstractChosen
       @form_field_jq.trigger("chosen:maxselected", {chosen: this})
       return false
 
-    unless @is_multiple
-      @search_container.append @search_field
-
     @container.addClass "chosen-with-drop"
     @results_showing = true
 
@@ -262,10 +259,6 @@ class Chosen extends AbstractChosen
     if @results_showing
       this.result_clear_highlight()
 
-      unless @is_multiple
-        @selected_item.prepend @search_field
-        @search_field.focus()
-
       @container.removeClass "chosen-with-drop"
       @form_field_jq.trigger("chosen:hiding_dropdown", {chosen: this})
 
@@ -373,15 +366,18 @@ class Chosen extends AbstractChosen
 
       @form_field.options[item.options_index].selected = true
       @selected_option_count = null
-      @search_field.val("")
 
       if @is_multiple
         this.choice_build item
       else
         this.single_set_selected_text(this.choice_label(item))
 
       if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey))
-        this.winnow_results()
+        if evt.metaKey or evt.ctrlKey
+          this.winnow_results(skip_highlight: true)
+        else
+          @search_field.val("")
+          this.winnow_results()
       else
         this.results_hide()
         this.show_search_field_default()

vendor/assets/javascripts/chosen.proto.coffee

@@ -235,9 +235,6 @@ class @Chosen extends AbstractChosen
       @form_field.fire("chosen:maxselected", {chosen: this})
       return false
 
-    unless @is_multiple
-      @search_container.insert @search_field
-
     @container.addClassName "chosen-with-drop"
     @results_showing = true
 
@@ -254,10 +251,6 @@ class @Chosen extends AbstractChosen
     if @results_showing
       this.result_clear_highlight()
 
-      unless @is_multiple
-        @selected_item.insert top: @search_field
-        @search_field.focus()
-
       @container.removeClassName "chosen-with-drop"
       @form_field.fire("chosen:hiding_dropdown", {chosen: this})
 
@@ -365,15 +358,18 @@ class @Chosen extends AbstractChosen
 
       @form_field.options[item.options_index].selected = true
       @selected_option_count = null
-      @search_field.value = ""
 
       if @is_multiple
         this.choice_build item
       else
         this.single_set_selected_text(this.choice_label(item))
 
       if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey))
-        this.winnow_results()
+        if evt.metaKey or evt.ctrlKey
+          this.winnow_results(skip_highlight: true)
+        else
+          @search_field.value = ""
+          this.winnow_results()
       else
         this.results_hide()
         this.show_search_field_default()

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

@@ -51,7 +51,7 @@ class AbstractChosen
 
   choice_label: (item) ->
     if @include_group_label_in_selected and item.group_label?
-      "<b class='group-name'>#{item.group_label}</b>#{item.html}"
+      "<b class='group-name'>#{this.escape_html(item.group_label)}</b>#{item.html}"
     else
       item.html
 
@@ -114,7 +114,7 @@ class AbstractChosen
 
     option_el = document.createElement("li")
     option_el.className = classes.join(" ")
-    option_el.style.cssText = option.style
+    option_el.style.cssText = option.style if option.style
     option_el.setAttribute("data-option-array-index", option.array_index)
     option_el.innerHTML = option.highlighted_html or option.html
     option_el.title = option.title if option.title
@@ -159,7 +159,7 @@ class AbstractChosen
     else
       this.results_show()
 
-  winnow_results: ->
+  winnow_results: (options) ->
     this.no_results_clear()
 
     results = 0
@@ -214,7 +214,7 @@ class AbstractChosen
       this.no_results query
     else
       this.update_results_content this.results_option_build()
-      this.winnow_results_set_highlight()
+      this.winnow_results_set_highlight() unless options?.skip_highlight
 
   get_search_regex: (escaped_search_string) ->
     regex_string = if @search_contains then escaped_search_string else "(^|\\s|\\b)#{escaped_search_string}[^\\s]*"
@@ -332,12 +332,12 @@ class AbstractChosen
   get_single_html: ->
     """
       <a class="chosen-single chosen-default">
-        <input class="chosen-search-input" type="text" autocomplete="off" />
         <span>#{@default_text}</span>
         <div><b></b></div>
       </a>
       <div class="chosen-drop">
         <div class="chosen-search">
+          <input class="chosen-search-input" type="text" autocomplete="off" />
         </div>
         <ul class="chosen-results"></ul>
       </div>

vendor/assets/stylesheets/chosen-base.scss

@@ -22,10 +22,12 @@ $chosen-sprite-retina: image-url('[email protected]') !default;
     border-top: 0;
     background: #fff;
     box-shadow: 0 4px 5px rgba(#000,.15);
-    display: none;
+    clip: rect(0,0,0,0);
+    clip-path: inset(100% 100%);
   }
   &.chosen-with-drop .chosen-drop {
-    display: block;
+    clip: auto;
+    clip-path: none;
   }
   a{
     cursor: pointer;
@@ -67,12 +69,6 @@ $chosen-sprite-retina: image-url('[email protected]') !default;
     text-decoration: none;
     white-space: nowrap;
     line-height: 24px;
-
-    input[type="text"] {
-      cursor: pointer;
-      opacity: 0;
-      position: absolute;
-    }
   }
   .chosen-default {
     color: #999;
@@ -146,6 +142,7 @@ $chosen-sprite-retina: image-url('[email protected]') !default;
   &.chosen-container-single-nosearch .chosen-search {
     position: absolute;
     clip: rect(0,0,0,0);
+    clip-path: inset(100% 100%);
   }
 }
 /* @end */