abracadabra 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0772db47b26302b1a7d1cc017e412547dcd636f0
-  data.tar.gz: ac9a933d2cd21b7dcb7b9a829c86fffb948f87b0
+  metadata.gz: 2e278480715ec17aca8e37299701755c70cbc868
+  data.tar.gz: c0924415b005bc88e6f6599e526ff9b3754c0f9c
 SHA512:
-  metadata.gz: 7059bd2ee97b4b62fa9c75a836a5f164dcd70b66240888499946414759a3467c3799ca40024f8098c07211b3ef96c40678daa0012855ef1d6e2cebf642adfe57
-  data.tar.gz: 70cb2ba854378ed4f63729a47069247910592975559e086dee6994a64f1c26d2664dfe4aae6dfbd9d2a1111a0a00560fd769dec26a6eebcd6abc662d26245582
+  metadata.gz: 7e8d0e0377c5b2d984639fcab19c040b586f53fdb037f1e895d2c647df5f4c3774fe3a6b004dc4fc6e4faaca7acaa5bb8b16af005e2e3f44ba7c335d7d72f83e
+  data.tar.gz: e3b8ab44882e0fb8f3809422abcfca1d03dda31bc9414a329b9154185b709433aef075174af787e46f05c37cf469698e24fafdcd2579c8e21ed248056f0746ce

data/README.md

@@ -94,7 +94,7 @@ type: :js
 # Default: :script (:js)
 
 # IMPORTANT: On ajax:success, this will remove the specific abracadabra instance from 
-# the DOM entirely.
+# the DOM entirely. ALSO, this will be remote if the main form is remote.
 deletable: true
 # Boolean: DELETE will be submitted without a confirmation dialog
 # OR
@@ -109,6 +109,11 @@ deletable_path: user_path(@user)
 # Description: Specifies where the form will be submitted. 
 # Default: path (uses the same path as the main form if `deletable_path` isn't declared).
 
+deletable_type: :js
+# Description: Deletable content type -- responds to any content type (:js and :script
+# can both be used to respond with Javascript).
+# Default: :script (:js)
+
 # Boolean: Open the next abracadabra instance after successful form submission (main 
 # form, not the DELETE link's submission) by using `.abracadabra` as the selector.
 tab_to_next: true
@@ -116,7 +121,7 @@ tab_to_next: true
 tab_to_next: ".my-class"
 # IMPORTANT: If this is a class, this abracadabra instance MUST have the same class
 # as well.
-# String: The class or ID of the next abracadabra instance to open on succesful form 
+# String: The class or ID of the next abracadabra instance to open on successful form 
 # submission. Use `.` before a class selector or `#` before a an ID selector just as you 
 # would when finding an element in Javascript.
 # Description: Puts a link to DELETE the object (obviously, it always uses DELETE as the 

data/app/assets/javascripts/abracadabra.js

@@ -153,6 +153,18 @@ $(function() {
     }
     /* /Check if button classes have been manually overridden elsewhere */
 
+    /* AJAX? */
+    if(remote == "") {
+      authToken = "<input name=\"authenticity_token\" type=\"hidden\" value=\"" + $("meta[name=\"csrf-token\"]").attr("content") + "\">";
+      type = "";
+      deletableType = "";
+    } else {
+      authToken = "";
+      type = " data-type=\"" + link.data("type") + "\"";
+      deletableType = " data-type=\"" + link.data("deletable-type") + "\"";
+    }
+    /* /AJAX? */
+
     /* Deletable? */
     if(link.data("deletable") !== false) {
       deletablePath = link.data("deletable-path");
@@ -162,7 +174,7 @@ $(function() {
       } else {
         deletableConfirm = " data-confirm=\"" + deletableConfirm + "\"";
       }
-      deletable = "<span class=\"abracadabra-delete-container\"><a href=\"" + deletablePath + "\" class=\"abracadabra-delete\" data-method=\"delete\"" + deletableConfirm + remote + " rel=\"nofollow\"><i class=\"" + abracadabraDeleteIcon + "\"></i></a></span>";
+      deletable = "<span class=\"abracadabra-delete-container\"><a href=\"" + deletablePath + "\" class=\"abracadabra-delete\" data-method=\"delete\"" + deletableConfirm + remote + deletableType + " rel=\"nofollow\"><i class=\"" + abracadabraDeleteIcon + "\"></i></a></span>";
     } else {
       deletable = "";
     }
@@ -187,16 +199,6 @@ $(function() {
     }
     /* /Submit on blur? */
 
-    /* AJAX? */
-    if(remote == "") {
-      authToken = "<input name=\"authenticity_token\" type=\"hidden\" value=\"" + $("meta[name=\"csrf-token\"]").attr("content") + "\">";
-      type = "";
-    } else {
-      authToken = "";
-      type = " data-type=\"" + link.data("type") + "\"";
-    }
-    /* /AJAX? */
-
     /* Show buttons? */
     if(link.data("buttonless") == true) {
       buttons = "";

data/app/helpers/abracadabra/rails/view_helper.rb

@@ -10,7 +10,7 @@ module Abracadabra
         path = options[:path]
         buttonless = options[:buttonless] || false
         deletable = options[:deletable] || false
-        deletable_path = options[:deletable_path] || path
+        deletable_path = options[:deletable_path] || path 
         submit_on_blur = options[:submit_on_blur] || false
 
         if options[:tab_to_next] || options[:tab_to_next] != false
@@ -30,6 +30,7 @@ module Abracadabra
         end
 
         data_type = options[:type].to_s.gsub(/^j+s+$/, "script") || "script"
+        deletable_type = options[:deletable_type].to_s.gsub(/^j+s+$/, "script") || "script"
 
         link_to(
           value,
@@ -45,6 +46,7 @@ module Abracadabra
             buttonless: buttonless, 
             deletable: deletable,
             deletable_path: deletable_path,
+            deletable_type: deletable_type.to_sym,
             tab_to_next: tab_to_next,
             submit_on_blur: submit_on_blur
           }, 

data/lib/abracadabra/version.rb

@@ -1,5 +1,5 @@
 module Abracadabra
   module Rails
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abracadabra
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Trevor Hinesley