effective_datatables 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe669a7536deb43686a84bb9fc15f93f76eaf84
-  data.tar.gz: 86359d4b303b234f904c51b9bf0eeb846d924c57
+  metadata.gz: 4dabd6230608916ad4260f443412c2b81bb4ec80
+  data.tar.gz: 26a82f35207f348157706794fcb818a1b58e77db
 SHA512:
-  metadata.gz: f76787e95bab3aa54d510e9dbb2d69215ec74bc9ef061ecc7eb692fecd98298af9053d3ec5196d39b537aca0f67713833418536563c97e67a4191bed0eca64d9
-  data.tar.gz: 297ccbf127f6e1d4871c13294f67bef61ea2ddddeeafa89244d208b7b016c7517106b2999cca213361630de3c2185e5b7dab0c71678e4e03bb995c121840e0e0
+  metadata.gz: 17fd09f4caa9cfd14798fe9744a627e355f4f90504cb40a02943b35155fe25d15a4e7708bfab3d4a167b1acd3a9260ba2d8fa95117566cb085b21679099258de
+  data.tar.gz: b31833cadf5f81ba9e5e7cb69260891fb2498647b872243afd9cec216070ff8c9d40be2da3137b78b06ff60b21f766d2ea081cbc2f6c2dd77e3a10b68868dbaf

data/README.md

@@ -545,6 +545,10 @@ actions_col do |post|
 end
 ```
 
+Any `data-remote` actions will be hijacked and performed as inline ajax by datatables.
+
+If you'd like to opt-out of this behavior, use `actions_col(inline: false)` or add `data-inline: false` to your action link.
+
 ### length
 
 Sets the default number of rows per page. Valid lengths are `5`, `10`, `25`, `50`, `100`, `250`, `500`, `:all`

data/app/assets/javascripts/effective_datatables/inline_crud.js.coffee

@@ -2,10 +2,12 @@
 # This works with EffectiveForm.remote_form which is part of the effective_bootstrap gem.
 
 # About to do a resource action, or fetch a partial. Show loading.
-$(document).on 'ajax:beforeSend', '.dataTables_wrapper', (e, xhr, settings) ->
+$(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-actions', (e, xhr, settings) ->
   $action = $(e.target)
   $table = $(e.target).closest('table')
 
+  return true if ('' + $action.data('inline')) == 'false'
+
   $params =  $.param({_datatable_id: $table.attr('id'), _datatable_cookie: $table.data('cookie') })
   settings.url += (if settings.url.indexOf('?') == -1 then '?' else '&') + $params
 
@@ -19,8 +21,10 @@ $(document).on 'ajax:beforeSend', '.dataTables_wrapper', (e, xhr, settings) ->
   true
 
 # We have either completed the resource action, or fetched the inline form to load.
-$(document).on 'ajax:success', '.dataTables_wrapper', (e) ->
-  $action = $(e.target)
+$(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event) ->
+  $action = $(event.target)
+
+  return true if ('' + $action.data('inline')) == 'false'
 
   if ($action.data('method') || 'get') == 'get'
     if $action.closest('tr').parent().prop('tagName') == 'THEAD' then afterNew($action) else afterEdit($action)
@@ -32,8 +36,10 @@ $(document).on 'ajax:success', '.dataTables_wrapper', (e) ->
   true
 
 # The inline form has been submitted successfully
-$(document).on '.dataTables_wrapper effective-form:success', (event, flash) ->
-  $tr = $(event.target).closest('tr')
+$(document).on '.dataTables_wrapper .col-inline-form effective-form:success', (event, flash) ->
+  $action = $(event.target)
+
+  $tr = $action.closest('tr')
   $table = $tr.closest('table')
 
   if $tr.hasClass('effective-datatables-new-resource')
@@ -48,8 +54,8 @@ $(document).on '.dataTables_wrapper effective-form:success', (event, flash) ->
     $tr.fadeOut('slow')
 
 # There was an error completing something
-$(document).on 'ajax:error', '.dataTables_wrapper', (e) ->
-  $action = $(e.target)
+$(document).on 'ajax:error', '.dataTables_wrapper .col-inline-form', (event) ->
+  $action = $(event.target)
   $table = $action.closest('table')
   $table.DataTable().flash('Error: unable to ' + ($action.attr('title') || 'complete action')).draw()
 

data/app/assets/javascripts/effective_datatables/overrides.js.coffee

@@ -28,13 +28,4 @@ flash = (message) ->
 
   return @
 
-turboDestroy = ->
-  @iterator('table', (settings) ->
-    $(window).off('.DT-' + settings.sInstance)
-
-    index = $.inArray(settings, $.fn.DataTable.settings)
-    $.fn.DataTable.settings.splice(index, 1) if index > -1
-  )
-
 $.fn.DataTable.Api.register('flash()', flash);
-$.fn.DataTable.Api.register('turboDestroy()', turboDestroy);

data/app/helpers/effective_datatables_private_helper.rb

@@ -67,6 +67,7 @@ module EffectiveDatatablesPrivateHelper
       )
     when :select, :boolean
       options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: '')
+
       form.select name, collection, options
     when :bulk_actions
       options[:data]['role'] = 'bulk-actions'
@@ -95,12 +96,12 @@ module EffectiveDatatablesPrivateHelper
     value = datatable.state[:filter][name]
 
     options = opts.except(:parse).merge(
-      placeholder: placeholder,
+      autocomplete: 'off',
       feedback: false,
       label: false,
+      placeholder: placeholder,
       value: value,
-      wrapper: { class: 'form-group col-auto'},
-      autocomplete: 'off'
+      wrapper: { class: 'form-group col-auto'}
     )
 
     options[:name] = '' unless datatable._filters_form_required?
@@ -120,6 +121,22 @@ module EffectiveDatatablesPrivateHelper
     end
   end
 
+  def datatable_scope_tag(form, datatable, opts = {})
+    collection = datatable._scopes.map { |name, opts| [opts[:label], name] }
+
+    options = {
+      autocomplete: 'off',
+      buttons: true,
+      checked: datatable.state[:scope],
+      feedback: false,
+      label: false,
+      required: false,
+      wrapper: { class: 'form-group col-auto'}
+    }.merge(opts)
+
+    form.radios :scope, collection, options
+  end
+
   def render_datatable_charts(datatable)
     raise 'expected datatable to be present' unless datatable
 

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

@@ -2,9 +2,7 @@
   = effective_form_with(scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb]) do |form|
     .form-row.align-items-center
       - if datatable._scopes.present?
-        = form.radios :scope, datatable._scopes.map { |name, opts| [opts[:label], name] },
-          label: false, required: false, checked: datatable.state[:scope], buttons: true,
-          wrapper: { class: 'form-group col-auto' }
+        = datatable_scope_tag(form, datatable)
 
       - datatable._filters.each do |name, opts|
         = datatable_filter_tag(form, datatable, name, opts)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.3'.freeze
+  VERSION = '4.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails