effective_datatables 4.3.21 → 4.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16abc968c44876025dde5fcd633faf328642df6
-  data.tar.gz: 2c4f38ae922eb00e4dc5dbf46f9fb843dd3de926
+  metadata.gz: 85c4d234a41d794bc05590d5908a0cab2b5b9271
+  data.tar.gz: 2a39922c804f7455053c7bca291dba9baf8fb5ef
 SHA512:
-  metadata.gz: f22ddb2a8b4d015a65804a6f245652fb1f204f36878c898c786f1bbd0c62d8c886630097e27ffd95163a0abe2e82ac3c9fb992afdaa0e56fcc90a2d7d5d9d97c
-  data.tar.gz: 3da4b7eab6631e79dd1d7fe8e25b4d2cb8bb0e7baf7414389f0a528321c60454a254f030050b9377ac2f522a562d946ff0ee65797cc47bfb2b6c47e58b737728
+  metadata.gz: 59be28e8ab3d8d34c37b2c54601471b4b760dfa64efed01c7d37cb464d8d2861a8c88504e9245c6c1fbb56816b54fccf267051223e6a376fdb6c50e10e9e61dc
+  data.tar.gz: a2cc1cbcc432e583f3379c0e876b6da967a04f9f64d3f934a9667e70e36f3fd30c4f655adaed6b26341f2e9ad0cae4edabe14438f8e418e90d2bde7596810e2a

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

@@ -11,7 +11,7 @@ $(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-actions', (e, xhr, s
   $params =  $.param({_datatable_id: $table.attr('id'), _datatable_cookie: $table.data('cookie'), _datatable_action: true })
   settings.url += (if settings.url.indexOf('?') == -1 then '?' else '&') + $params
 
-  if $action.closest('.effective-datatables-inline-row').length > 0
+  if $action.closest('.effective-datatables-inline-row,table.dataTable').hasClass('effective-datatables-inline-row')
     # Nothing.
   else if $action.closest('tr').parent().prop('tagName') == 'THEAD'
     beforeNew($action)
@@ -86,7 +86,8 @@ beforeNew = ($action) ->
   # Append spinner and show Processing
   $th.append($table.data('spinner'))
   $table.DataTable().flash()
-  $table.one 'draw.dt', (event) -> $th.find('a').show().siblings('svg').remove()
+  $table.one 'draw.dt', (event) ->
+    $th.find('a').show().siblings('svg').remove() if event.target == event.currentTarget
 
 afterNew = ($action) ->
   $tr = $action.closest('tr')
@@ -99,7 +100,7 @@ afterNew = ($action) ->
   $table.children('tbody').prepend($tr)
 
   expand($table)
-  $tr.find('form').attr('data-remote', true).trigger('effective-bootstrap:initialize')
+  $tr.find('form').attr('data-remote', true).trigger('turbolinks:load')
   $tr.hide().fadeIn()
 
 beforeEdit = ($action) ->
@@ -126,7 +127,7 @@ afterEdit = ($action) ->
   $tr.addClass('effective-datatables-inline-row')
 
   expand($table)
-  $tr.find('form').attr('data-remote', true).trigger('effective-bootstrap:initialize')
+  $tr.find('form').attr('data-remote', true).trigger('turbolinks:load')
   $tr.hide().fadeIn()
 
 # This is when one of the resource actions completes
@@ -149,11 +150,13 @@ buildRow = (length, payload) ->
 
 expand = ($table) ->
   $wrapper = $table.closest('.dataTables_wrapper').addClass('effective-datatables-inline-expanded')
-  $table.one 'draw.dt', (event) -> $wrapper.removeClass('effective-datatables-inline-expanded')
+  $table.on 'draw.dt', (event) ->
+    $wrapper.removeClass('effective-datatables-inline-expanded') if event.target == event.currentTarget
 
 cancel = ($table) ->
   $wrapper = $table.closest('.dataTables_wrapper')
-  $wrapper.removeClass('effective-datatables-inline-expanded') if $wrapper.find('.effective-datatables-inline-row').length == 0
+  if $wrapper.find('.effective-datatables-inline-row').length == 0
+    $wrapper.removeClass('effective-datatables-inline-expanded')
 
 refreshDatatables = ($source) ->
   return unless EffectiveForm.remote_form_refresh_datatables.length > 0

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -43,6 +43,8 @@ table.dataTable > thead {
     tr { opacity: 0.4; }
 
     tr.effective-datatables-inline-row {
+      tr { opacity: 1.0; }
+
       visibility: visible;
       opacity: 1.0;
 

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

@@ -14,8 +14,11 @@ module Effective
       def datatables_inline_request?
         return @_datatables_inline_request unless @_datatables_inline_request.nil?
 
-        @_datatables_inline_request =
-          (view && view.params[:_datatable_cookie] && cookie_keys.include?(view.params[:_datatable_cookie])) == true
+        @_datatables_inline_request = (
+          view &&
+          view.params[:_datatable_id].to_s.split('-')[0...-1] == to_param.split('-')[0...-1] &&
+          cookie_keys.include?(view.params[:_datatable_cookie])
+        )
       end
 
       def params

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

@@ -91,6 +91,8 @@ module Effective
         if datatables_ajax_request?
           load_filter_params!
           load_ajax_state!
+        elsif datatables_inline_request?
+          load_cookie_state!
         elsif cookie.present? && cookie[:params] == params.length && EffectiveDatatables.save_state
           load_cookie_state!
         else

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.21'.freeze
+  VERSION = '4.3.22'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.21
+  version: 4.3.22
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails