chosen-rails 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec448c4b6a43013c078a609be6aa8346a77ac64
-  data.tar.gz: 48e99ab37060ce3e9b3c72964396de56db1cf946
+  metadata.gz: 627f993c355b60dd67a5f475a7e3049eab8ad08a
+  data.tar.gz: f5a266a53e616da1847ea1401caa18a99b77e785
 SHA512:
-  metadata.gz: 3ec8744609fca23ffb76ce935d458af3b77a0916a411f451a6a365b0d5036ea8fa855780b0307e0af6f03b8f0a9e656f97324e5edb409d3c25f0cbb64b85860d
-  data.tar.gz: 35c86ccec24fad335baf4bbd164d51f0fe0a6ea4b679e8827c3435bb37c95a998714ac021acbf0909b4db14e71a006a19c13170390c12e59424cdb96e80c8f92
+  metadata.gz: d09814cc265bbece45725638297abb5fc1285aed5c1cad288580c87c63f8c46a00acd371f31663f9aef273070653f2aea41c048a265cb615ce4f97da5c34bc58
+  data.tar.gz: 926cfe2150e8b4874e105ad800c2f663f71748cb25c2d1e402e9add3dbf1e8c00879608d9a3b5c9b1e1f9714ba5cc69c353bb88ef1050073cf3c3bd198010556

data/lib/chosen-rails.rb

@@ -2,10 +2,13 @@ require 'chosen-rails/version'
 
 module Chosen
   module Rails
-    if ::Rails.version.to_s < '3.1'
-      require 'chosen-rails/railtie'
-    else
+    case ::Rails.version.to_s
+    when /^4/
       require 'chosen-rails/engine'
+    when /^3\.[12]/
+      require 'chosen-rails/engine3'
+    when /^3\.[0]/
+      require 'chosen-rails/railtie'
     end
   end
 end

data/lib/chosen-rails/engine.rb

@@ -1,6 +1,9 @@
 module Chosen
   module Rails
     class Engine < ::Rails::Engine
+      config.assets.precompile += %w(
+        chosen-sprite*.png
+      )
     end
   end
 end

data/lib/chosen-rails/engine3.rb

@@ -0,0 +1,11 @@
+module Chosen
+  module Rails
+    class Engine3 < ::Rails::Engine
+      initializer 'chosen.assets.precompile' do |app|
+        app.config.assets.precompile += %w(
+          chosen-sprite*.png
+        )
+      end
+    end
+  end
+end

data/lib/chosen-rails/version.rb

@@ -1,6 +1,6 @@
 module Chosen
   module Rails
-    VERSION = '0.9.13'
-    CHOSEN_VERSION = '0.9.13'
+    VERSION = '0.9.14'
+    CHOSEN_VERSION = '0.9.14'
   end
 end

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

@@ -44,9 +44,9 @@ class Chosen extends AbstractChosen
     @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" style="left:-9000px;"><ul class="chzn-results"></ul></div>'
+      @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>'
     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" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'
+      @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>'
 
     @form_field_jq.hide().after @container
     @dropdown = @container.find('div.chzn-drop').first()
@@ -78,6 +78,7 @@ class Chosen extends AbstractChosen
     @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
 
     @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
@@ -93,7 +94,6 @@ class Chosen extends AbstractChosen
     else
       @container.click (evt) => evt.preventDefault(); return # gobble click of anchor
 
-
   search_field_disabled: ->
     @is_disabled = @form_field_jq[0].disabled
     if(@is_disabled)
@@ -125,6 +125,13 @@ class Chosen extends AbstractChosen
   container_mouseup: (evt) ->
     this.results_reset(evt) if evt.target.nodeName is "ABBR" and not @is_disabled
 
+  search_results_mousewheel: (evt) ->
+    delta = -evt.originalEvent?.wheelDelta or evt.originialEvent?.detail
+    if delta?
+      evt.preventDefault()
+      delta = delta * 40 if evt.type is 'DOMMouseScroll'
+      @search_results.scrollTop(delta + @search_results.scrollTop())
+
   blur_test: (evt) ->
     this.close_field() if not @active_field and @container.hasClass "chzn-container-active"
 
@@ -220,16 +227,15 @@ class Chosen extends AbstractChosen
     @result_highlight = null
 
   results_show: ->
-    if not @is_multiple
-      @selected_item.addClass "chzn-single-with-drop"
-      if @result_single_selected
-        this.result_do_highlight( @result_single_selected )
-    else if @max_selected_options <= @choices
+    if @result_single_selected?
+      this.result_do_highlight @result_single_selected
+    else if @is_multiple and @max_selected_options <= @choices
       @form_field_jq.trigger("liszt:maxselected", {chosen: this})
       return false
 
+    @container.addClass "chzn-with-drop"
     @form_field_jq.trigger("liszt:showing_dropdown", {chosen: this})
-    @dropdown.css {"left":0}
+
     @results_showing = true
 
     @search_field.focus()
@@ -238,10 +244,11 @@ class Chosen extends AbstractChosen
     this.winnow_results()
 
   results_hide: ->
-    @selected_item.removeClass "chzn-single-with-drop" unless @is_multiple
     this.result_clear_highlight()
+
+    @container.removeClass "chzn-with-drop"
     @form_field_jq.trigger("liszt:hiding_dropdown", {chosen: this})
-    @dropdown.css {"left":"-9000px"}
+
     @results_showing = false
 
 
@@ -281,12 +288,6 @@ class Chosen extends AbstractChosen
   search_results_mouseout: (evt) ->
     this.result_clear_highlight() if $(evt.target).hasClass "active-result" or $(evt.target).parents('.active-result').first()
 
-
-  choices_click: (evt) ->
-    evt.preventDefault()
-    if( @active_field and not($(evt.target).hasClass "search-choice" or $(evt.target).parents('.search-choice').first) and not @results_showing )
-      this.results_show()
-
   choice_build: (item) ->
     if @is_multiple and @max_selected_options <= @choices
       @form_field_jq.trigger("liszt:maxselected", {chosen: this})
@@ -570,8 +571,3 @@ class Chosen extends AbstractChosen
     string
 
 root.Chosen = Chosen
-
-get_side_border_padding = (elmt) ->
-  side_border_padding = elmt.outerWidth() - elmt.width()
-
-root.get_side_border_padding = get_side_border_padding

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

@@ -17,8 +17,8 @@ class Chosen extends AbstractChosen
     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" 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>')
+    @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>')
     @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>')
     @no_results_temp = new Template('<li class="no-results">' + @results_none_found + ' "<span>#{terms}</span>"</li>')
@@ -69,6 +69,8 @@ class Chosen extends AbstractChosen
     @search_results.observe "mouseup", (evt) => this.search_results_mouseup(evt)
     @search_results.observe "mouseover", (evt) => this.search_results_mouseover(evt)
     @search_results.observe "mouseout", (evt) => this.search_results_mouseout(evt)
+    @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)
@@ -114,6 +116,13 @@ class Chosen extends AbstractChosen
   container_mouseup: (evt) ->
     this.results_reset(evt) if evt.target.nodeName is "ABBR" and not @is_disabled
 
+  search_results_mousewheel: (evt) ->
+    delta = -evt.wheelDelta or evt.detail
+    if delta?
+      evt.preventDefault()
+      delta = delta * 40 if evt.type is 'DOMMouseScroll'
+      @search_results.scrollTop = delta + @search_results.scrollTop
+
   blur_test: (evt) ->
     this.close_field() if not @active_field and @container.hasClassName("chzn-container-active")
 
@@ -207,16 +216,15 @@ class Chosen extends AbstractChosen
     @result_highlight = null
 
   results_show: ->
-    if not @is_multiple
-      @selected_item.addClassName('chzn-single-with-drop')
-      if @result_single_selected
-        this.result_do_highlight( @result_single_selected )
-    else if @max_selected_options <= @choices
+    if @result_single_selected?
+      this.result_do_highlight @result_single_selected
+    else if @is_multiple and @max_selected_options <= @choices
       @form_field.fire("liszt:maxselected", {chosen: this})
       return false
 
+    @container.addClassName "chzn-with-drop"
     @form_field.fire("liszt:showing_dropdown", {chosen: this})
-    @dropdown.setStyle {"left":0}
+
     @results_showing = true
 
     @search_field.focus()
@@ -225,10 +233,11 @@ class Chosen extends AbstractChosen
     this.winnow_results()
 
   results_hide: ->
-    @selected_item.removeClassName('chzn-single-with-drop') unless @is_multiple
     this.result_clear_highlight()
+
+    @container.removeClassName "chzn-with-drop"
     @form_field.fire("liszt:hiding_dropdown", {chosen: this})
-    @dropdown.setStyle({"left":"-9000px"})
+
     @results_showing = false
 
 
@@ -268,12 +277,6 @@ class Chosen extends AbstractChosen
   search_results_mouseout: (evt) ->
     this.result_clear_highlight() if evt.target.hasClassName('active-result') or evt.target.up('.active-result')
 
-
-  choices_click: (evt) ->
-    evt.preventDefault()
-    if( @active_field and not(evt.target.hasClassName('search-choice') or evt.target.up('.search-choice')) and not @results_showing )
-      this.results_show()
-
   choice_build: (item) ->
     if @is_multiple and @max_selected_options <= @choices
       @form_field.fire("liszt:maxselected", {chosen: this})
@@ -556,10 +559,3 @@ class Chosen extends AbstractChosen
       @search_field.setStyle({'width': w + 'px'})
 
 root.Chosen = Chosen
-
-
-get_side_border_padding = (elmt) ->
-  layout = new Element.Layout(elmt)
-  side_border_padding = layout.get("border-left") + layout.get("border-right") + layout.get("padding-left") + layout.get("padding-right")
-
-root.get_side_border_padding = get_side_border_padding

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

@@ -95,6 +95,10 @@ class AbstractChosen
     else
       this.results_show()
 
+  choices_click: (evt) ->
+    evt.preventDefault()
+    this.results_show() unless @results_showing
+
   keyup_checker: (evt) ->
     stroke = evt.which ? evt.keyCode
     this.search_field_scale()
@@ -128,10 +132,10 @@ class AbstractChosen
 
   container_width: ->
     return @options.width if @options.width?
-      
+
     width = if window.getComputedStyle?
       parseFloat window.getComputedStyle(@form_field).getPropertyValue('width')
-    else if jQuery?
+    else if jQuery? and @form_field_jq?
       @form_field_jq.outerWidth()
     else
       @form_field.getWidth()

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

@@ -13,7 +13,7 @@
     border-top: 0
     position: absolute
     top: 100%
-    left: 0
+    left: -9999px
     -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15)
     -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15)
     box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15)
@@ -24,6 +24,8 @@
     -webkit-box-sizing: border-box
     -khtml-box-sizing: border-box
     box-sizing: border-box
+  &.chzn-with-drop .chzn-drop
+    left: 0
 
 /* @end
 
@@ -315,7 +317,7 @@
     -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3)
     box-shadow: 0 0 5px rgba(0, 0, 0, 0.3)
     border: 1px solid #5897fb
-  .chzn-single-with-drop
+  &.chzn-with-drop .chzn-single
     border: 1px solid #aaa
     -webkit-box-shadow: 0 1px 0 #fff inset
     -moz-box-shadow: 0 1px 0 #fff inset
@@ -384,13 +386,19 @@
       .search-choice-close
         left: 4px
         right: auto
+  .chzn-search
+    left: 9999px
+  &.chzn-with-drop .chzn-search
+    left: 0px
+  .chzn-drop
+    left: 9999px
   &.chzn-container-single .chzn-results
     margin: 0 0 4px 4px
     padding: 0 4px 0 0
   .chzn-results .group-option
     padding-left: 0
     padding-right: 15px
-  &.chzn-container-active .chzn-single-with-drop div
+  &.chzn-container-active.chzn-with-drop .chzn-single div
     border-right: none
   .chzn-search input
     background: white image-url('chosen-sprite.png') no-repeat -30px -20px
@@ -405,7 +413,7 @@
 .chzn-container-single.chzn-rtl
   .chzn-single div b
     background-position: 6px 2px
-  .chzn-single-with-drop div b
+  &.chzn-with-drop .chzn-single div b
     background-position: -12px 2px
 
 /* @end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chosen-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Tse-Ching Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -110,6 +110,7 @@ files:
 - chosen-rails.gemspec
 - lib/chosen-rails.rb
 - lib/chosen-rails/engine.rb
+- lib/chosen-rails/engine3.rb
 - lib/chosen-rails/railtie.rb
 - lib/chosen-rails/source_file.rb
 - lib/chosen-rails/version.rb