app/assets/javascripts/abracadabra.js in abracadabra-1.0.7 vs app/assets/javascripts/abracadabra.js in abracadabra-1.0.8
- old
+ new
@@ -151,20 +151,32 @@
if(typeof abracadabraDeleteIcon == "undefined") {
abracadabraDeleteIcon = "fa fa-times-circle-o";
}
/* /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");
deletableConfirm = link.data("deletable");
if(deletableConfirm === true) {
deletableConfirm = "";
} 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 = "";
}
/* /Deletable? */
@@ -184,19 +196,9 @@
submitOnBlur = " data-submit-on-blur=\"true\"";
} else {
submitOnBlur = "";
}
/* /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 = "";
} else {
\ No newline at end of file