effective_datatables 4.3.23 → 4.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9103e5d57c0218b0e58169b02848afb057fab9a
-  data.tar.gz: a88158032fb84eba48715a905cae56c62109aa1e
+  metadata.gz: 837c6fb296619d4702ade84dabb37a83b5365857
+  data.tar.gz: 98fb11c65c1ed5fcddf849fdc06cc0d43cabfce3
 SHA512:
-  metadata.gz: 3597f751ede4accd994fcb97c2fc92f0b55bf6bc8db23daaaedbe82bf2f281425b238d9b703479b77f5046fc520933aef3c5c58937ba16a323362fad664ed19a
-  data.tar.gz: 158ce8b46ab3716c514443596a6fb16d84bb9f72fe4072ca6728360f43735293e7292470199aa8561986a48b4a3bdaf55dbaccbb53c2feeef225839b1fe81336
+  metadata.gz: 946f4f80a506e7c8f6b5ab7445b8e274068cc5d10fcdb0fa5d475240976d19ed58aeae7996593e8af1686f59ad48685ae1c0293ff53ac9b6f6df199fb2077a26
+  data.tar.gz: 33f482a18a73adf8901f57d87f50c6262abcd5981b755555990fb4f2e0f31f50e8e871daf62a9f2204b4ad0b168b1dc874786a3856e86ae65166d673f676661f

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

@@ -64,17 +64,19 @@ $(document).on 'effective-form:success', '.dataTables_wrapper .col-inline-form',
   $table = $tr.closest('table')
 
   if $tr.hasClass('effective-datatables-new-resource')
-    $table.DataTable().flash(flash || 'Item created', 'success').draw()
+    $table.DataTable().flash(flash || 'Item created', 'success')
     $tr.fadeOut('slow')
 
     $actions = $table.children('thead').find('th.col-actions')
     $actions.children('svg').remove()
     $actions.children('a').fadeIn()
   else
-    $table.DataTable().flash(flash || 'Item updated', 'success').draw()
+    $table.DataTable().flash(flash || 'Item updated', 'success')
     $tr.fadeOut('slow')
 
-  refreshDatatables($table)
+  unless redirectDatatables($table)
+    $table.DataTable().draw()
+    refreshDatatables($table)
 
 beforeNew = ($action) ->
   $table = $action.closest('table')
@@ -136,11 +138,13 @@ afterAction = ($action) ->
 
   if EffectiveForm.remote_form_flash.length > 0
     flash = EffectiveForm.remote_form_flash[0]
-    $table.DataTable().flash(flash[1], flash[0]).draw()
+    $table.DataTable().flash(flash[1], flash[0])
   else
-    $table.DataTable().flash('Successfully ' + $action.attr('title'), 'success').draw()
+    $table.DataTable().flash('Successfully ' + $action.attr('title'), 'success')
 
-  refreshDatatables($table)
+  unless redirectDatatables($table)
+    $table.DataTable().draw()
+    refreshDatatables($table)
 
 buildRow = (length, payload) ->
   "<td class='col-inline-form' colspan='#{length-1}'><div class='container'>#{payload}</div></td>" +
@@ -158,6 +162,19 @@ cancel = ($table) ->
   if $wrapper.find('.effective-datatables-inline-row').length == 0
     $wrapper.removeClass('effective-datatables-inline-expanded')
 
+redirectDatatables = ($source) ->
+  return false unless EffectiveForm.remote_form_refresh_datatables.length > 0
+
+  if EffectiveForm.remote_form_refresh_datatables.includes('refresh')
+    if Turbolinks?
+      Turbolinks.visit(window.location.href, { action: 'replace'})
+    else
+      window.location.reload()
+
+    return true
+
+  false
+
 refreshDatatables = ($source) ->
   return unless EffectiveForm.remote_form_refresh_datatables.length > 0
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.23'.freeze
+  VERSION = '4.3.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.23
+  version: 4.3.24
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails