chosen-rails 0.9.8.3 → 0.9.9

data/chosen-rails.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |gem|
   gem.version       = Chosen::Rails::VERSION
 
   gem.add_dependency "railties", "~> 3.0"
-  gem.add_dependency "thor",     "~> 0.14"
+  gem.add_dependency "coffee-rails", "~> 3.2"
+  gem.add_dependency "sass-rails", "~> 3.2"
+
   gem.add_development_dependency "bundler", "~> 1.0"
   gem.add_development_dependency "rails",   "~> 3.0"
-  gem.add_development_dependency "sass",    "~> 3.1"
+  gem.add_development_dependency "thor",    "~> 0.14"
 end

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = "0.9.8.3"
-    CHOSEN_VERSION = "0.9.8"
+    VERSION = "0.9.9"
+    CHOSEN_VERSION = "0.9.9"
   end
 end

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

@@ -41,7 +41,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 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>'
+      container_div.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" 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)
@@ -89,12 +89,13 @@ class Chosen extends AbstractChosen
     @search_field.blur (evt) => this.input_blur(evt)
     @search_field.keyup (evt) => this.keyup_checker(evt)
     @search_field.keydown (evt) => this.keydown_checker(evt)
+    @search_field.focus (evt) => this.input_focus(evt)
 
     if @is_multiple
       @search_choices.click (evt) => this.choices_click(evt)
-      @search_field.focus (evt) => this.input_focus(evt)
     else
       @container.click (evt) => evt.preventDefault() # gobble click of anchor
+    
 
   search_field_disabled: ->
     @is_disabled = @form_field_jq[0].disabled
@@ -135,10 +136,6 @@ class Chosen extends AbstractChosen
   close_field: ->
     $(document).unbind "click", @click_test_action
 
-    if not @is_multiple
-      @selected_item.attr "tabindex", @search_field.attr("tabindex")
-      @search_field.attr "tabindex", -1
-
     @active_field = false
     this.results_hide()
 
@@ -150,10 +147,6 @@ class Chosen extends AbstractChosen
     this.search_field_scale()
 
   activate_field: ->
-    if not @is_multiple and not @active_field
-      @search_field.attr "tabindex", (@selected_item.attr "tabindex")
-      @selected_item.attr "tabindex", -1
-
     @container.addClass "chzn-container-active"
     @active_field = true
 
@@ -262,12 +255,7 @@ class Chosen extends AbstractChosen
     if @form_field_jq.attr "tabindex"
       ti = @form_field_jq.attr "tabindex"
       @form_field_jq.attr "tabindex", -1
-
-      if @is_multiple
-        @search_field.attr "tabindex", ti
-      else
-        @selected_item.attr "tabindex", ti
-        @search_field.attr "tabindex", -1
+      @search_field.attr "tabindex", ti
 
   show_search_field_default: ->
     if @is_multiple and @choices < 1 and not @active_field
@@ -282,6 +270,7 @@ class Chosen extends AbstractChosen
     if target.length
       @result_highlight = target
       this.result_select(evt)
+      @search_field.focus()
 
   search_results_mouseover: (evt) ->
     target = if $(evt.target).hasClass "active-result" then $(evt.target) else $(evt.target).parents(".active-result").first()

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

@@ -17,7 +17,7 @@ class Chosen extends AbstractChosen
     super()
     
     # HTML Templates
-    @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>')
+    @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" 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>')
     @choice_noclose_temp = new Template('<li class="search-choice search-choice-disabled" id="#{id}"><span>#{choice}</span></li>')
@@ -81,10 +81,10 @@ class Chosen extends AbstractChosen
     @search_field.observe "blur", (evt) => this.input_blur(evt)
     @search_field.observe "keyup", (evt) => this.keyup_checker(evt)
     @search_field.observe "keydown", (evt) => this.keydown_checker(evt)
+    @search_field.observe "focus", (evt) => this.input_focus(evt)
 
     if @is_multiple
       @search_choices.observe "click", (evt) => this.choices_click(evt)
-      @search_field.observe "focus", (evt) => this.input_focus(evt)
     else
       @container.observe "click", (evt) => evt.preventDefault() # gobble click of anchor
 
@@ -126,10 +126,6 @@ class Chosen extends AbstractChosen
   close_field: ->
     document.stopObserving "click", @click_test_action
     
-    if not @is_multiple
-      @selected_item.tabIndex = @search_field.tabIndex
-      @search_field.tabIndex = -1
-    
     @active_field = false
     this.results_hide()
 
@@ -141,17 +137,12 @@ class Chosen extends AbstractChosen
     this.search_field_scale()
 
   activate_field: ->
-    if not @is_multiple and not @active_field
-      @search_field.tabIndex = @selected_item.tabIndex
-      @selected_item.tabIndex = -1
-
     @container.addClassName "chzn-container-active"
     @active_field = true
 
     @search_field.value = @search_field.value
     @search_field.focus()
 
-
   test_active_click: (evt) ->
     if evt.target.up('#' + @container_id)
       @active_field = true
@@ -252,12 +243,7 @@ class Chosen extends AbstractChosen
     if @form_field.tabIndex
       ti = @form_field.tabIndex
       @form_field.tabIndex = -1
-
-      if @is_multiple
-        @search_field.tabIndex = ti
-      else
-        @selected_item.tabIndex = ti
-        @search_field.tabIndex = -1
+      @search_field.tabIndex = ti
 
   show_search_field_default: ->
     if @is_multiple and @choices < 1 and not @active_field
@@ -272,6 +258,7 @@ class Chosen extends AbstractChosen
     if target
       @result_highlight = target
       this.result_select(evt)
+      @search_field.focus()
 
   search_results_mouseover: (evt) ->
     target = if evt.target.hasClassName("active-result") then evt.target else evt.target.up(".active-result")

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

@@ -7,10 +7,9 @@ root = this
 class AbstractChosen
 
   constructor: (@form_field, @options={}) ->
-    this.set_default_values()
-    
     @is_multiple = @form_field.multiple
     this.set_default_text()
+    this.set_default_values()
 
     this.setup()
 
@@ -49,7 +48,10 @@ class AbstractChosen
   mouse_leave: -> @mouse_on_container = false
 
   input_focus: (evt) ->
-    setTimeout (=> this.container_mousedown()), 50 unless @active_field
+    if @is_multiple
+      setTimeout (=> this.container_mousedown()), 50 unless @active_field
+    else
+      @activate_field() unless @active_field
   
   input_blur: (evt) ->
     if not @mouse_on_container

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chosen-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.8.3
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,13 +92,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.14'
 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: