effective_datatables 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33500ce573ca5338516e3e79dfb3c06c44dc81d
-  data.tar.gz: 6aa75a77d9bf1151deb0cfc71935086f2cb75fdd
+  metadata.gz: 78bd204abaed2266a4181b691f12d54a80fd44e8
+  data.tar.gz: e589cd16e82ce18b1fe771096992d65e79c2c145
 SHA512:
-  metadata.gz: 9de12751ecd5de42f4404d52e90ff3666e1ecff389d8f6acc2e3c108a8e4493a923a9025ce192c0e86e99f72e75cbf68180b06d76fbeef925e901f336aa3838a
-  data.tar.gz: 41f47e6044204bc970b0660b7a583d5a46e17ac9725465ef763ffbe711c1580f108d24d509812c774836527f4bf8c03acb99a65502af6fb50fa5e0403a5f648d
+  metadata.gz: f43d5f8b2e4913c95d18c309e5824d72914aca83fb22f22678e1783d56bcfbdd6a1b4dc797ba40e7fef73cecf51798d07c351e2ccdc0aa7baf15736a60107a41
+  data.tar.gz: 375369ddc8cdc7ec70069dc06c0f6c65097f14019f0b08c35a799dd57018e2b978b2493a473155be975460495b682d77b224229305fb30a23bc4586d02e2d421

data/app/assets/javascripts/effective_datatables/initialize.js.coffee.erb

@@ -62,7 +62,8 @@ initializeDataTables = ->
       # Assign PreSearch columns
       search_inputs.each (index, input) =>
         $input = $(input)
-        table.fnSettings().aoPreSearchCols[$input.data('column-index')].sSearch = $input.val() if $input.val()
+        if $input.data('column-index') && $input.val()
+          table.fnSettings().aoPreSearchCols[$input.data('column-index')].sSearch = $input.val()
 
       # FixedColumns doesn't work well yet.
       # fixedColumns = new $.fn.dataTable.FixedColumns(table,

data/app/helpers/effective_datatables_helper.rb

@@ -20,7 +20,7 @@ module EffectiveDatatablesHelper
     case opts[:filter][:type]
     when :string, :text, :number
       form.input name, :label => false, :required => false, :as => :string, :placeholder => (opts[:label] || name),
-        :input_html => { :autocomplete => 'off', :data => {'column-name' => opts[:name], 'column-index' => opts[:index]} }
+        :input_html => { :name => nil, :autocomplete => 'off', :data => {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     when :select, :boolean
       if opts[:filter][:values].respond_to?(:call)
         opts[:filter][:values] = opts[:filter][:values].call()
@@ -31,7 +31,7 @@ module EffectiveDatatablesHelper
       end
 
       form.input name, :label => false, :required => false, :as => :select, :collection => opts[:filter][:values], :include_blank => (opts[:label] || name.titleize),
-        :input_html => { :autocomplete => 'off', :data => {'column-name' => opts[:name], 'column-index' => opts[:index]} }
+        :input_html => { :name => nil, :autocomplete => 'off', :data => {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     else
       content_tag(:p, opts[:label] || name)
     end

data/app/views/effective/datatables/_datatable.html.haml

@@ -21,21 +21,23 @@
     }
   }
 
-= simple_form_for datatable, :url => '#', :html => {:id => "#{datatable.to_param}-form" } do |f|
-  %table.effective-datatable{effective_datatable_params}
-    %thead
-      - max_depth = datatable.table_columns.map { |_, opts| opts[:th][:depth].to_i rescue 0 }.max
-      - [*0..max_depth].each do |depth|
-        %tr
-          - table_columns = datatable.table_columns.select { |_, opts| (opts[:th][:depth] || 0 rescue 0) == depth }
-          - table_columns.each do |name, opts|
-            %th{(opts[:th] || {}).merge({:title => opts[:label] || name})}
-              = render_datatable_header_cell(f, name, opts, filterable)
-            - (opts[:append_th] || []).each do |faux_col|
-              %th{(faux_col[:th] || {}).merge({:title => faux_col[:label]})}
-                = faux_col[:label]
-    %tbody
-      - (datatable.to_json[:data] || []).each do |row|
-        %tr
-          - row.each do |col|
-            %td= col.to_s.html_safe
+  form_builder = nil
+  simple_form_for(datatable, url: '#', html: {id: "#{datatable.to_param}-form"}) { |f| form_builder = f }
+
+%table.effective-datatable{effective_datatable_params}
+  %thead
+    - max_depth = datatable.table_columns.map { |_, opts| opts[:th][:depth].to_i rescue 0 }.max
+    - [*0..max_depth].each do |depth|
+      %tr
+        - table_columns = datatable.table_columns.select { |_, opts| (opts[:th][:depth] || 0 rescue 0) == depth }
+        - table_columns.each do |name, opts|
+          %th{(opts[:th] || {}).merge({:title => opts[:label] || name})}
+            = render_datatable_header_cell(form_builder, name, opts, filterable)
+          - (opts[:append_th] || []).each do |faux_col|
+            %th{(faux_col[:th] || {}).merge({:title => faux_col[:label]})}
+              = faux_col[:label]
+  %tbody
+    - (datatable.to_json[:data] || []).each do |row|
+      %tr
+        - row.each do |col|
+          %td= col.to_s.html_safe

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails