chosen-rails 0.9.7.1 → 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011 by Tse-Ching Ho
+Copyright (C) 2011-2012 by Tse-Ching Ho
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = "0.9.7.1"
-    EDITOR_VERSION = "0.9.7"
+    VERSION = "0.9.8"
+    EDITOR_VERSION = "0.9.8"
   end
 end

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

@@ -40,7 +40,7 @@ class Chosen extends AbstractChosen
     if @is_multiple
       container_div.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" style="left:-9000px;"><ul class="chzn-results"></ul></div>'
     else
-      container_div.html '<a href="javascript:void(0)" class="chzn-single"><span>' + @default_text + '</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>'
+      container_div.html '<a href="javascript:void(0)" class="chzn-single chzn-default"><span>' + @default_text + '</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>'
 
     @form_field_jq.hide().after container_div
     @container = ($ '#' + @container_id)
@@ -108,7 +108,7 @@ class Chosen extends AbstractChosen
   container_mousedown: (evt) ->
     if !@is_disabled
       target_closelink =  if evt? then ($ evt.target).hasClass "search-choice-close" else false
-      if evt and evt.type is "mousedown"
+      if evt and evt.type is "mousedown" and not @results_showing
         evt.stopPropagation()
       if not @pending_destroy_click and not target_closelink
         if not @active_field
@@ -187,7 +187,7 @@ class Chosen extends AbstractChosen
         if data.selected and @is_multiple
           this.choice_build data
         else if data.selected and not @is_multiple
-          @selected_item.find("span").text data.text
+          @selected_item.removeClass("chzn-default").find("span").text data.text
           this.single_deselect_control_build() if @allow_single_deselect
 
     this.search_field_disabled()
@@ -315,6 +315,7 @@ class Chosen extends AbstractChosen
   results_reset: (evt) ->
     @form_field.options[0].selected = true
     @selected_item.find("span").text @default_text
+    @selected_item.addClass("chzn-default") if not @is_multiple
     this.show_search_field_default()
     $(evt.target).remove();
     @form_field_jq.trigger "change"
@@ -332,6 +333,7 @@ class Chosen extends AbstractChosen
       else
         @search_results.find(".result-selected").removeClass "result-selected"
         @result_single_selected = high
+        @selected_item.removeClass("chzn-default")
       
       high.addClass "result-selected"
       
@@ -383,7 +385,8 @@ class Chosen extends AbstractChosen
     results = 0
 
     searchText = if @search_field.val() is @default_text then "" else $('<div/>').text($.trim(@search_field.val())).html()
-    regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
+    regexAnchor = if @search_contains then "" else "^"
+    regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
     zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
 
     for option in @results_data

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

@@ -16,7 +16,7 @@ class Chosen extends AbstractChosen
     super()
     
     # HTML Templates
-    @single_temp = new Template('<a href="javascript:void(0)" class="chzn-single"><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>')
+    @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>')
     @no_results_temp = new Template('<li class="no-results">' + @results_none_found + ' "<span>#{terms}</span>"</li>')
@@ -101,7 +101,7 @@ class Chosen extends AbstractChosen
   container_mousedown: (evt) ->
     if !@is_disabled
       target_closelink =  if evt? then evt.target.hasClassName "search-choice-close" else false
-      if evt and evt.type is "mousedown"
+      if evt and evt.type is "mousedown" and not @results_showing
         evt.stop()
       if not @pending_destroy_click and not target_closelink
         if not @active_field
@@ -179,7 +179,7 @@ class Chosen extends AbstractChosen
         if data.selected and @is_multiple
           this.choice_build data
         else if data.selected and not @is_multiple
-          @selected_item.down("span").update( data.html )
+          @selected_item.removeClassName("chzn-default").down("span").update( data.html )
           this.single_deselect_control_build() if @allow_single_deselect
 
     this.search_field_disabled()
@@ -308,6 +308,7 @@ class Chosen extends AbstractChosen
   results_reset: (evt) ->
     @form_field.options[0].selected = true
     @selected_item.down("span").update(@default_text)
+    @selected_item.addClassName("chzn-default") if not @is_multiple
     this.show_search_field_default()
     evt.target.remove()
     @form_field.simulate("change") if typeof Event.simulate is 'function'
@@ -322,6 +323,7 @@ class Chosen extends AbstractChosen
         this.result_deactivate high
       else
         @search_results.descendants(".result-selected").invoke "removeClassName", "result-selected"
+        @selected_item.removeClassName("chzn-default")
         @result_single_selected = high
       
       high.addClassName("result-selected")
@@ -374,7 +376,8 @@ class Chosen extends AbstractChosen
     results = 0
 
     searchText = if @search_field.value is @default_text then "" else @search_field.value.strip().escapeHTML()
-    regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
+    regexAnchor = if @search_contains then "" else "^"
+    regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
     zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
 
     for option in @results_data

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
+    @search_contains = @options.search_contains || false
     @choices = 0
     @results_none_found = @options.no_results_text or "No results match"
 

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

@@ -52,6 +52,9 @@
     padding: 0 0 0 8px
     color: #444444
     text-decoration: none
+  .chzn-default
+    color: #999
+  .chzn-single
     span
       margin-right: 26px
       display: block

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chosen-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.7.1
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 +08:00
-default_executable: 
+date: 2012-03-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70140411288040 !ruby/object:Gem::Requirement
+  requirement: &70127787354960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140411288040
+  version_requirements: *70127787354960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70140411287540 !ruby/object:Gem::Requirement
+  requirement: &70127787354420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70140411287540
+  version_requirements: *70127787354420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70140411287020 !ruby/object:Gem::Requirement
+  requirement: &70127787353860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70140411287020
+  version_requirements: *70127787353860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70140411286480 !ruby/object:Gem::Requirement
+  requirement: &70127787353280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70140411286480
+  version_requirements: *70127787353280
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70140411286000 !ruby/object:Gem::Requirement
+  requirement: &70127787348600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70140411286000
+  version_requirements: *70127787348600
 description: Chosen is a javascript library of select box enhancer for jQuery and
   Protoype. This gem integrates Chosen with Rails asset pipeline for easy of use.
 email:
@@ -94,7 +93,6 @@ files:
 - vendor/assets/javascripts/lib/abstract-chosen.coffee
 - vendor/assets/javascripts/lib/select-parser.coffee
 - vendor/assets/stylesheets/chosen.css.sass
-has_rdoc: true
 homepage: https://github.com/tsechingho/chosen-rails
 licenses: []
 post_install_message: 
@@ -115,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Integrate Chosen javascript library with Rails asset pipeline