effective_datatables 4.3.11 → 4.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757e9b2a23e793cd4a23f256081e934158382470
-  data.tar.gz: 07384269bfde4ec6ee093dc9daf12ada59a9bbde
+  metadata.gz: 29a6e0d0478885ad23309fecf7867b03dca64adf
+  data.tar.gz: 0b61e07209624deada4c8d3eaf250582cbb2c2b4
 SHA512:
-  metadata.gz: c103ba1ed623dc9d2dfeae8c690832e1430e6c552e19fafacfb7ce2ca405ecb87a9fa0fbfb494c3e3145e0076f5db8e5fc3ddc64b3d2ac679dc81a67b0901b5b
-  data.tar.gz: b5565e1159345988e29de498933e4e372f72a74d219052a0b2a67257df8adbbb77e1c1d7e4ae6dc9f0ee73bd96fd9595c5544ac95efe7dd22795f93b97066ea9
+  metadata.gz: 487154867732b2b954e9f1966246b6d9e32d919cc885ec8f98771bf020f58a1c8ed85177214442187357b1b464fa8063affffe6b9ba2f18a983e9d54022d98b3
+  data.tar.gz: 5fba36836e3c439dfa736e67fa9bb84ef4ef50c4b46880d9431effb321f1d7c9cb1052338e56b139926aa7558fe7b62ede4e2fc52f62def9f5e4b7a9e4dbbbf1

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

@@ -78,11 +78,11 @@ $(document).on 'click', '.dataTables_wrapper .buttons-bulk-actions a', (event) -
       data: { ids: values, authenticity_token: token }
       successCallback: ->
         success = "Successfully completed #{title} bulk action"
-        $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success)
+        $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success, 'success')
         $table.DataTable().draw()
       failCallback: ->
         error = "An error occured while attempting #{title} bulk action"
-        $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(error)
+        $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(error, 'danger')
         $table.DataTable().draw()
     )
   else # Normal AJAX post
@@ -94,11 +94,11 @@ $(document).on 'click', '.dataTables_wrapper .buttons-bulk-actions a', (event) -
       data: { ids: values }
     ).done((response) ->
       success = response['message'] || "Successfully completed #{title} bulk action"
-      $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success) and restoreSelected($(e.target), values)
+      $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success, 'success') and restoreSelected($(e.target), values)
 
     ).fail((response) ->
       error = response['message'] || "An error occured while attempting #{title} bulk action: #{response.statusText}"
-      $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(error) and restoreSelected($(e.target), values)
+      $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(error, 'danger') and restoreSelected($(e.target), values)
 
     ).always((response) ->
       $table.DataTable().draw()

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

@@ -1,18 +1,28 @@
-flash = (message) ->
+flash = (message, status = '') ->
   @context[0].oFeatures.bProcessing = false
 
   message ||= 'Processing...'
 
+  if status == 'danger'
+    message = 'Error: ' + message
+
   $processing = $(@table().node()).siblings('.dataTables_processing')
+  $processing.removeClass('alert-success alert-info alert-warning alert-danger alert-error')
+
+  if status.length > 0
+    $processing.addClass("alert-#{status}")
+
   $processing.html(message).show()
 
   timeout = $processing.data('timeout')
   clearTimeout(timeout) if timeout
 
+  delay = (if status == 'danger' then 4000 else 1000)
+
   $processing.html(message).data('timeout', setTimeout( =>
       $processing.html('Processing...').hide()
       @context[0].oFeatures.bProcessing = true
-    , 1500)
+    , delay)
   )
 
   return @

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

@@ -39,7 +39,7 @@ $(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event) ->
 $(document).on 'ajax:error', '.dataTables_wrapper', (event) ->
   $action = $(event.target)
   $table = $action.closest('table')
-  $table.DataTable().flash('Error: unable to ' + ($action.attr('title') || 'complete action')).draw()
+  $table.DataTable().flash('unable to ' + ($action.attr('title') || 'complete action'), 'danger').draw()
 
   EffectiveForm.remote_form_payload = ''
   EffectiveForm.remote_form_flash = ''
@@ -53,18 +53,16 @@ $(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').draw()
+    $table.DataTable().flash(flash || 'Item created', 'success').draw()
     $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').draw()
+    $table.DataTable().flash(flash || 'Item updated', 'success').draw()
     $tr.fadeOut('slow')
 
-
-
 beforeNew = ($action) ->
   $table = $action.closest('table')
   $th = $action.closest('th')
@@ -124,9 +122,9 @@ afterAction = ($action) ->
 
   if EffectiveForm.remote_form_flash.length > 0
     flash = EffectiveForm.remote_form_flash[0]
-    $table.DataTable().flash((if flash[0] == 'danger' then 'Error:' else "#{flash[0]}:") + ' ' + flash[1]).draw()
+    $table.DataTable().flash(flash[1], flash[0]).draw()
   else
-    $table.DataTable().flash('Successfully ' + $action.attr('title')).draw()
+    $table.DataTable().flash('Successfully ' + $action.attr('title'), 'success').draw()
 
 buildRow = (length, payload) ->
   "<td class='col-inline-form' colspan='#{length-1}'><div class='container'>#{payload}</div></td>" +

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

@@ -17,7 +17,7 @@ reorder = (event, diff, edit) ->
     data: data,
     async: false
   ).fail((response, text, status) =>
-    $(event.target).closest('table').DataTable().flash(status)
+    $(event.target).closest('table').DataTable().flash(status, 'danger')
   ).always((response) =>
     @context[0].rowreorder.c.enable = true
   )

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.11'.freeze
+  VERSION = '4.3.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.11
+  version: 4.3.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails