Handle JS returned by a controller on batch actions

mlt · Nov 28, 2019 · 7dad596 · 7dad596
1 parent c418c46
commit 7dad596
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/assets/javascripts/tabulatr/_events.js b/app/assets/javascripts/tabulatr/_events.js
@@ -34,6 +34,8 @@
 
   $(document).on('click', '.batch-action-inputs', function(){
     var a = $(this);
+    if(a.attr('id')) // user wants specific action and has a handler for it
+      return;
     var name = a.data('do-batch-action-name');
     var key = a.data('do-batch-action');
     var tableId = a.data('table-id');

diff --git a/app/assets/javascripts/tabulatr/_tabulatr.js b/app/assets/javascripts/tabulatr/_tabulatr.js
@@ -107,7 +107,12 @@ Tabulatr.prototype = {
     return $('#'+ this.id +' tbody tr.tabulatr-row').length;
   },
 
-  handleResponse: function(response) {
+  handleResponse: function(response, status, xhr) {
+    // Generally we expect JSON, otherwise we assume user knows what they are doing
+    var ct = xhr.getResponseHeader("content-type") || "";
+    // Capybara::Poltergeist::JavascriptError with ES6 startsWith :(
+    if (ct.indexOf("text/javascript") === 0)
+      return;
     if (typeof response === "string")
       response = JSON.parse(response);
 

diff --git a/app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim b/app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim
@@ -31,12 +31,15 @@
           - label     = data
           - download  = false
           - extension = nil
+          - id = nil
         - else
           - label    = data[:text]
           - download = !!data[:download]
           - extension = data[:extension]
+          - id = data[:id]
         li
-          = link_to label, '#', class: "batch-action-inputs", data: { \
+          = link_to label, '#', id: id, class: "batch-action-inputs",
+            data: { \
               "turbolinks" => false, \
               "do-batch-action-name" => iname, \
               "do-batch-action" => key, \