effective_datatables 4.5.2 → 4.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801035ec41d62120ec00afa643d281fd0bcf5918
-  data.tar.gz: 9551e713b05fac2d08f1e4c83db278469f5a182d
+  metadata.gz: f73868f30d757dbceec3c540399e657f754140ba
+  data.tar.gz: ac64d4fd479f389703a2d8ff33a13c96baef82b3
 SHA512:
-  metadata.gz: 40fc0df539d7c55bf3b10e5265dc145147e87f0f62543c6e67a139d681bf43b97a6df05ddff14ba9178348d9fe04139a532e870d51892aa85bd2720d64233a13
-  data.tar.gz: baa7bedfdf52a8adeb73a7a9e7d5eea2b12b10dc901c7a577be94040a15851acacfc7ede503e847ab9b513131d440b0d210ce75545bd0a7d17100b3ade8579b7
+  metadata.gz: 554a2ba6fa77dda79130231dfb466b294de74ae17e7770a46af79a29bfba91f8b2f2f3d3e4c4e7f6464d0b34e2f4f22f7b4e909411769c9ba559cde39578736a
+  data.tar.gz: e2cd5f8b2131b6ea9cbac07b73e46bf006c69ebc17866921e7121e2ffbf5fc61634793da5f60832b989c192f5419d343cfc409241018948a3094c0029b6aaf1b

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

@@ -185,6 +185,8 @@ initializeDataTables = (target) ->
       table.DataTable().on('row-reorder', (event, diff, edit) -> $(event.target).DataTable().reorder(event, diff, edit))
 
     table.addClass('initialized')
+    table.children('thead').trigger('effective-bootstrap:initialize')
+    true
 
 destroyDataTables = ->
   $('.effective-datatables-inline-expanded').removeClass('effective-datatables-inline-expanded')

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

@@ -21,11 +21,15 @@ $(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-actions', (e, xhr, s
   true
 
 # We have either completed the resource action, or fetched the inline form to load.
-$(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event) ->
+$(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event, data) ->
   $action = $(event.target)
 
   return true if ('' + $action.data('inline')) == 'false'
 
+  if data.length > 0
+    return true if data.indexOf('Turbolinks.clearCache()') == 0 && data.includes("Turbolinks.visit(")
+    return true if data.indexOf('<html') >= 0
+
   if ($action.data('method') || 'get') == 'get'
     if $action.closest('tr').parent().prop('tagName') == 'THEAD' then afterNew($action) else afterEdit($action)
   else
@@ -34,6 +38,7 @@ $(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event) ->
   EffectiveForm.remote_form_payload = ''
   EffectiveForm.remote_form_flash = ''
   EffectiveForm.remote_form_refresh_datatables = ''
+
   true
 
 # There was an error completing something

data/app/models/effective/effective_datatable/format.rb

@@ -113,12 +113,30 @@ module Effective
 
       # Takes all default resource actions
       # Applies data-remote to anything that's data-method post or delete
+      # Merges in any extra attributes when passed as a Hash
       def actions_col_actions(column)
-        if column[:inline]
+        actions = if column[:inline]
           resource.resource_actions.transform_values { |opts| opts['data-remote'] = true; opts }
         else
           resource.resource_actions.transform_values { |opts| opts['data-remote'] = true if opts['data-method']; opts }
         end
+
+        # Merge local options. Special behaviour for remote: false
+        if column[:actions].kind_of?(Hash)
+          column[:actions].each do |action, opts|
+            next unless opts.kind_of?(Hash)
+
+            existing = actions.find { |_, v| v[:action] == action }.first
+            next unless existing.present?
+
+            actions[existing]['data-remote'] = opts[:remote] if opts.key?(:remote)
+            actions[existing]['data-remote'] = opts['remote'] if opts.key?('remote')
+
+            actions[existing].merge!(opts.except(:remote, 'remote'))
+          end
+        end
+
+        actions
       end
 
       def resource_col_locals(opts)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.5.2'.freeze
+  VERSION = '4.5.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
 platform: ruby
 authors:
 - Code and Effect