chosen-awesome-rails 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753b8b56b10d8afabb1b00e40537ce896906728f
-  data.tar.gz: 6a12cdd3920ce72b0c343445397ae463dda8b098
+  metadata.gz: 83b18c9dda7c321268a60e99da75a2724585c054
+  data.tar.gz: 1b293fb54a12a4ebf435e1a6c0f26ba9bdcadc3a
 SHA512:
-  metadata.gz: f08674691cb3adc8ee5206ce8d25085b994c9b7598b5330f3bf4e7a8d01ea562f12c0efdf537ef6d31f85da114ab7e7362be77161b81563fffe36463182c2909
-  data.tar.gz: 5d705d50f2263136a0307bbe5644946366c618235fc46db7e39786ae8b06721e36dc85f5a3be9635a7bf1089d73afb8ecf3e64e72580475b7d60326131d0481d
+  metadata.gz: ce188e12f5e2ac30b1d3d7280bee6e3e0cba2aaf399156fcfbff8aaedc2c73e675262f1f7b1a8391edfd48400eac3efd00b727e839d56661939641a17be118d7
+  data.tar.gz: 48743fef272a6ddf06371103e94bc38e32e435dc01f100d65a41e308289afce5ba824a60e97c35add75fcd5462ace2c8deac4d8fdda6067e10223c85929c7448

data/chosen-awesome-rails.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "chosen-awesome-rails".freeze
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

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

@@ -285,7 +285,7 @@ class Chosen
 
     @$dropdown.bind "mouseover", "li.chosen-option", (evt) => @dropdown_mouseover(evt)
     @$dropdown.bind "mousedown", "li.chosen-option", (evt) => @dropdown_mousedown(evt)
-    @$dropdown.bind "mousewheel DOMMouseScroll", (evt) => @prevent_page_scroll(evt)
+    @$dropdown.bind "mousewheel DOMMouseScroll",     (evt) => @dropdown_scroll(evt)
 
     @$container.addClass("opened")
     @$dropdown.addClass("opened")
@@ -338,11 +338,20 @@ class Chosen
     evt.stopImmediatePropagation()
     return
 
-  prevent_page_scroll: (evt) ->
+  dropdown_scroll: (evt) ->
     delta = evt.originalEvent.wheelDelta || -evt.originalEvent.detail
 
-    if (delta < 0 and @$dropdown.$list[0].scrollHeight - @$dropdown.scrollTop() == @$dropdown.innerHeight()) or (delta > 0 and @$dropdown.scrollTop() == 0)
+    if (delta < 0 and @$dropdown.$list[0].scrollHeight - @$dropdown.scrollTop() <= @$dropdown.innerHeight())
       evt.preventDefault()
+      evt.stopImmediatePropagation()
+
+      # Try pulling next pages
+      if @ajax
+        @pull_next_page()
+
+    else if (delta > 0 and @$dropdown.scrollTop() <= 0)
+      evt.preventDefault()
+      evt.stopImmediatePropagation()
 
     return
 
@@ -384,9 +393,7 @@ class Chosen
 
     return
 
-  redraw_dropdown: (data) ->
-    @parser.update(data) unless data is undefined
-
+  redraw_dropdown: ->
     changed = @apply_filter()
 
     @update_dropdown_position()
@@ -484,13 +491,19 @@ class Chosen
 
   move_selection: (dir) ->
     cursor = @parser.index_of(@cursor_option) + dir
-    cursor = @parser.available_options.length - 1 if cursor < 0
-    cursor = 0 if cursor > @parser.available_options.length - 1
+
+    if cursor > @parser.available_options.length - 1
+      if @ajax and @ajax.has_more isnt false
+        # Try pulling next pages
+        @pull_next_page(=> @move_selection(dir))
+
+      return @
+
+    return @ if cursor < 0
 
     @move_selection_to(cursor)
 
     if @cursor_option and @cursor_option.selected and @parser.selectable_options.length
-      # TODO: optimize this, could be slow on large lists
       return @move_selection(dir)
 
     return @
@@ -504,12 +517,15 @@ class Chosen
     return unless @cursor_option
 
     $element = @cursor_option.$listed.addClass("active")
-    top = $element.position().top + $element.height()
+    top = $element.position().top
+    bottom = top + $element.outerHeight()
     list_height = @$dropdown.height()
     list_scroll = @$dropdown.scrollTop()
 
-    if top >= list_height + list_scroll or list_scroll >= top
-      @$dropdown.scrollTop($element.position().top)
+    if bottom >= list_height + list_scroll
+      @$dropdown.scrollTop(bottom - list_height)
+    else if list_scroll >= top
+      @$dropdown.scrollTop(top)
 
     return @
 
@@ -535,13 +551,17 @@ class Chosen
       clearTimeout(@ajax.pending_update)
 
     @ajax.pending_update = setTimeout =>
-      if @ajax.pending_request and @ajax.pending_request.readyState isnt 4
-        @ajax.pending_request.abort()
+      if @ajax.pending_update_request and @ajax.pending_update_request.readyState isnt 4
+        @ajax.pending_update_request.abort()
+
+      # Reset current page and has_more flag
+      delete @ajax.data.page if @ajax.data
+      delete @ajax.has_more
 
       data =
         query: @$container.$search.val()
 
-      @ajax.pending_request = $.ajax
+      @ajax.pending_update_request = $.ajax
         url:       @ajax.url
         type:      @ajax.type or "get"
         dataType:  @ajax.dataType or "json"
@@ -555,7 +575,8 @@ class Chosen
         success: (data) =>
           @loaded()
           @ajax.success?(arguments...)
-          @redraw_dropdown(data)
+          @parser.update(data) unless data is undefined
+          @redraw_dropdown()
         error: =>
           @error()
           @ajax.error?(arguments...)
@@ -565,6 +586,40 @@ class Chosen
 
     return @
 
+  pull_next_page: (cb) ->
+    return @ unless @ajax and @ajax.has_more isnt false
+
+    if @ajax.pending_next_page_request and @ajax.pending_next_page_request.readyState isnt 4
+      return @
+
+    @ajax.data ||= {}
+    @ajax.data.page = if @ajax.data.page then @ajax.data.page + 1 else 2
+
+    data =
+      query: @$container.$search.val()
+
+    @ajax.pending_next_page_request = $.ajax
+      url:       @ajax.url
+      type:      @ajax.type or "get"
+      dataType:  @ajax.dataType or "json"
+      data:      $.extend(data, @ajax.data or {})
+      async:     @ajax.async or true
+      xhrFields: @ajax.xhrFields
+
+      beforeSend: (xhr) =>
+        @loading()
+      success: (data) =>
+        @loaded()
+        @ajax.has_more = !!data.length
+        @parser.append(data) unless data is undefined
+        @redraw_dropdown()
+        cb() if cb
+      error: =>
+        @ajax.data.page = if @ajax.data.page is 2 then null else @ajax.data.page - 1
+        @error()
+
+    return @
+
   @is_ios: ->
     /iPad|iPhone|iPod/.test(navigator.userAgent) and not window.MSStream
 

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

@@ -17,6 +17,42 @@ class Chosen.Parser
     delete @chosen
     return
 
+  # Replaces all select options and parses it again
+  update: (data) ->
+    parser = @chosen.option_parser || @default_parser
+    selected_options = []
+
+    for option in @all_options
+      if option.selected or option.blank
+        selected_options.push(option)
+      else
+        option.$option.remove()
+
+    for attrs in data
+      parsed = parser(attrs)
+      value  = parsed.value.toString()
+      text   = parsed.text.toString()
+
+      unless $.grep(selected_options, (o) -> o.value is value and o.label is text ).length
+        @chosen.$target.append($("<option />", parsed))
+
+    @parse(selected_options)
+    return @
+
+  # Appends new options to the end of the list
+  append: (data) ->
+    parser = @chosen.option_parser || @default_parser
+
+    for attrs in data
+      parsed = parser(attrs)
+      value  = parsed.value.toString()
+      text   = parsed.text.toString()
+
+      unless $.grep(@all_options, (o) -> o.value is value and o.label is text).length
+        @insert(attrs, true)
+
+    return @
+
   parse: (selected_options = []) ->
     formatter = @chosen.option_formatter || @default_formatter
     current_group_label = null
@@ -42,90 +78,71 @@ class Chosen.Parser
       classes += " disabled" if option.disabled
 
       $option = $(option)
-      selected = $.grep(selected_options, (o) => o.value is option.value and o.label is option.label)[0]
+      selected = $.grep(selected_options, (o) -> o.value is option.value and o.label is option.label)[0]
       text = formatter($option)
 
-      option_obj =
-        $group: group
-        $listed: (selected and selected.$listed) or $("<li />", class: classes, html: text[0])
-        $choice: (selected and selected.$choice) or $("<li />", class: classes, html: [$reset_link.clone(), text[1]])
-        $option: (selected and selected.$option) or $option
-        blank: option.value is "" and index is 0
-        index: index
-        score: index * -1
-        label: option.text
-        value: option.value
-        selected: option.selected
-        disabled: option.disabled
+      chosen_option =
+        $group:     group
+        $listed:    (selected and selected.$listed) or $("<li />", class: classes, html: text[0])
+        $choice:    (selected and selected.$choice) or $("<li />", class: classes, html: [$reset_link.clone(), text[1]])
+        $option:    (selected and selected.$option) or $option
+        blank:      option.value is "" and index is 0
+        index:      index
+        score:      index * -1
+        label:      option.text
+        value:      option.value
+        selected:   option.selected
+        disabled:   option.disabled
         match_type: null
 
-      @all_options.push option_obj
+      @all_options.push chosen_option
 
-      unless option_obj.blank
-        @selected_options.push option_obj if option.selected
-        @selectable_options.push option_obj unless option.selected
+      unless chosen_option.blank
+        @selected_options.push chosen_option if option.selected
+        @selectable_options.push chosen_option unless option.selected
 
     @order()
     return @
 
-  sync: ->
-    for option in @all_options
-      if option.$option[0].selected and @selected_options.indexOf(option) < 0
-        @chosen.select(option, false)
-      else if not option.$option[0].selected and @selected_options.indexOf(option) >= 0
-        @chosen.deselect(option, false)
-
-  update: (data) ->
-    parser = @chosen.option_parser || @default_parser
-    selected_options = []
-
-    for option in @all_options
-      if option.selected or option.blank
-        selected_options.push(option)
-      else
-        option.$option.remove()
-
-    for attrs in data
-      parsed = parser(attrs)
-      unless $.grep(selected_options, (o) => o.value is parsed.value.toString() and o.label == parsed.text.toString() ).length
-        @chosen.$target.append($("<option />", parsed))
-
-    @parse(selected_options)
-    return @
+  insert: (option, append = false) ->
+    $option     = $("<option />", value: option.value, text: option.label)
+    $reset_link = @build_reset_link()
 
-  insert: (data) ->
     formatter = @chosen.option_formatter || @default_formatter
-    classes = "chosen-option"
-    $option = $("<option />", value: data.value, text: data.label)
-    $reset_link = @build_reset_link()
-    text = formatter($option)
+    text      = formatter($option)
+    classes   = "chosen-option"
 
     @chosen.$target.append($option)
 
-    option_obj =
-      $group: null
-      $listed: $("<li />", class: classes, html: text[0])
-      $choice: $("<li />", class: classes, html: [$reset_link, text[1]])
-      $option: $option
-      blank: false
-      index: 0
-      score: 0
-      label: $option[0].text
-      value: $option[0].value
-      selected: false
-      disabled: false
-      match_type: 0
-
-    @all_options.unshift option_obj
-    @available_options.unshift option_obj
-    @selectable_options.unshift option_obj
-
-    option_obj
+    chosen_option =
+      $group:     null
+      $listed:    $("<li />", class: classes, html: text[0])
+      $choice:    $("<li />", class: classes, html: [$reset_link, text[1]])
+      $option:    $option
+      blank:      false
+      index:      0
+      score:      0
+      label:      $option[0].text
+      value:      $option[0].value
+      selected:   false
+      disabled:   false
+      match_type: if append then null else 0
+
+    if append
+      @all_options.push chosen_option
+      @available_options.push chosen_option
+      @selectable_options.push chosen_option
+    else
+      @all_options.unshift chosen_option
+      @available_options.unshift chosen_option
+      @selectable_options.unshift chosen_option
+
+    chosen_option
 
   restore: (option) ->
     @select(option)
 
-    unless $.grep(@all_options, (o) => option.label is o.label).length
+    unless $.grep(@all_options, (o) -> option.label is o.label).length
       @chosen.$target.append(option.$option)
 
       @all_options.unshift option
@@ -145,6 +162,13 @@ class Chosen.Parser
       index = collection.indexOf(option)
       collection.splice(index, 1) if index > -1
 
+  sync: ->
+    for option in @all_options
+      if option.$option[0].selected and @selected_options.indexOf(option) < 0
+        @chosen.select(option, false)
+      else if not option.$option[0].selected and @selected_options.indexOf(option) >= 0
+        @chosen.deselect(option, false)
+
   to_html: ->
     last_group = null
     list = []
@@ -237,8 +261,10 @@ class Chosen.Parser
 
       expressions_collection = $.map(query, (word, index) ->
         return [[
-          new RegExp("^#{word}$", "i"), new RegExp("^#{word}", "i")
-          new RegExp("#{word}$", "i"), new RegExp(word, "i")
+          new RegExp("^#{word}$", "i"),
+          new RegExp("^#{word}", "i")
+          new RegExp("#{word}$", "i"),
+          new RegExp(word, "i")
         ]]
       )
 
@@ -283,8 +309,8 @@ class Chosen.Parser
 
   default_parser: (attrs) ->
     value: attrs.value
-    text: attrs.label
-    data: { source: attrs }
+    text:  attrs.label
+    data:  { source: attrs }
 
   default_formatter: ($option) ->
     value = $option.contents().text()
@@ -298,5 +324,4 @@ class Chosen.Parser
       tabindex: @chosen.$target[0].tabindex || "0"
     )
 
-
   @escape_exp: /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chosen-awesome-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - heaven