ransack_ui 0.1.5 → 0.1.6

data/app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb

@@ -27,9 +27,9 @@
       column_type = selected.data('type')
 
       base_id = target.attr('id').slice(0, -8)
-      predicate_select  = @element.find('select#' + base_id + 'p')
-      predicate_select2 = @element.find('#s2id_' + base_id + 'p')
-      query_input = $('input#' + base_id + "v_0_value")
+      predicate_select  = @element.find("select##{base_id}p")
+      predicate_select2 = @element.find("#s2id_#{base_id}p")
+      query_input = $("input##{base_id}v_0_value")
 
       # Initialize datepicker if column is date/datetime/time
       $.proxy(@init_datetimepicker, this)(base_id)
@@ -65,7 +65,7 @@
       else
         predicate_select2.show()
         # If Select2 is on query input, remove and set defaults
-        if query_select2 = @element.find('#s2id_' + base_id + 'v_0_value')
+        if query_select2 = @element.find("#s2id_#{base_id}v_0_value")
           query_input.select2('destroy')
           query_input.val('')
           previous_val = ''
@@ -81,17 +81,19 @@
         predicate_select.find('option').each (i, o) -> $(o).remove()
 
         $.each available, (i, p) =>
-          [val, label] = [p[0], p[1]]
+          [predicate, label] = [p[0], p[1]]
 
           # Also allow compound predicates, unless column
           # is a date type. (No support for any/all on dates yet.)
-          unless column_type?.match(/date|time/)
-            val = val.replace(/_(any|all)$/, '')
+          if !column_type?.match(/date|time/)
+            p_key = predicate.replace(/_(any|all)$/, '')
+          else
+            p_key = predicate
 
-          if val in predicates
+          if p_key in predicates
             # Get alternative predicate label depending on column type
-            label = @alt_predicate_label_or_default(val, column_type, label)
-            predicate_select.append $('<option value='+val+'>'+label+'</option>')
+            label = @alt_predicate_label_or_default(predicate, column_type, label)
+            predicate_select.append $("<option value=#{predicate}>#{label}</option>")
 
         # Select first predicate if current selection is invalid
         predicate_select.select2('val', previous_val)
@@ -105,11 +107,11 @@
       target   = $(e.currentTarget)
       p = target.val() || ""
       base_id = target.attr('id').slice(0, -1)
-      query_input = $('input#' + base_id + "v_0_value")
+      query_input = $("input##{base_id}v_0_value")
 
       # We need to use a dummy input to handle multiple terms
       multi_id = query_input.attr('id') + '_multi'
-      multi_input = @element.find('#' + multi_id)
+      multi_input = @element.find("##{multi_id}")
 
       if Select2?
         # Turn query input into Select2 tag list when query accepts multiple values
@@ -160,7 +162,7 @@
 
       # Fetch all query inputs for condition
       base_name = target.data('base-name')
-      inputs = @element.find('input[name^="'+base_name+'"]')
+      inputs = @element.find("input[name^=\"#{base_name}\"]")
 
       # Set the original query input to the first value before shifting inputs and values
       $(inputs[0]).val(e.val[0])
@@ -263,8 +265,8 @@
 
     init_datetimepicker: (base_id) ->
       if $.ui?.timepicker?
-        query_input = @element.find('input#' + base_id + "v_0_value")
-        selected_attr = @element.find('select#' + base_id + 'a_0_name option:selected')
+        query_input = @element.find("input##{base_id}v_0_value")
+        selected_attr = @element.find("select##{base_id}a_0_name option:selected")
 
         # Clear any datepicker from query input first
         query_input.datepicker('destroy')

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -81964240255838638
+      hash: 4299301087477081386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -81964240255838638
+      hash: 4299301087477081386
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24