clean and remove promise on triggerHandler

JavaTMP · Nov 5, 2018 · 0b737f9 · 0b737f9
1 parent 7a72f45
commit 0b737f9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 34 deletions.
diff --git a/dist/bootstrap-actionable.min.js b/dist/bootstrap-actionable.min.js
diff --git a/js/bootstrap-actionable.js b/js/bootstrap-actionable.js
@@ -109,39 +109,36 @@
                 var event = localOptions.linkEvent;
                 event.preventDefault();
                 var removeEvent = $.Event(localOptions.containerRemoveEventName, {_newTarget: $this});
-                $(localOptions.outputElement).triggerHandler(removeEvent).promise().done(function () {
-                    if (!removeEvent.isDefaultPrevented()) {
-                        $(localOptions.outputElement).off(localOptions.containerReadyEventName).promise().done(function () {
-                            $(localOptions.outputElement).off(localOptions.containerRemoveEventName).promise().done(function () {
-                                $(localOptions.outputElement).off(removeEvent).promise().done(function () {
-                                    $.ajax({
-                                        type: localOptions.ajaxMethodType,
-                                        async: true,
-                                        cache: localOptions.ajaxCache,
-                                        dataType: localOptions.ajaxDataType,
-                                        url: $this.attr("href"),
-                                        data: localOptions.ajaxDefaultData,
-                                        beforeSend: function (jqXHR, settings) {
-                                            if ($.isFunction(localOptions.ajaxBeforeSend)) {
-                                                return localOptions.ajaxBeforeSend.call(localOptions, jqXHR, settings);
-                                            }
-                                        },
-                                        success: function (response, textStatus, jqXHR) {
-                                            if ($.isFunction(localOptions.ajaxSuccess)) {
-                                                return localOptions.ajaxSuccess.call(localOptions, response, textStatus, jqXHR);
-                                            }
-                                        },
-                                        error: function (jqXHR, textStatus, errorThrown) {
-                                            if ($.isFunction(localOptions.ajaxError)) {
-                                                return localOptions.ajaxError.call(localOptions, jqXHR, textStatus, errorThrown);
-                                            }
-                                        }
-                                    });
-                                });
+                var removeResponse = $(localOptions.outputElement).triggerHandler(removeEvent);
+                if (!removeEvent.isDefaultPrevented()) {
+                    $(localOptions.outputElement).off(localOptions.containerReadyEventName).promise().done(function () {
+                        $(localOptions.outputElement).off(localOptions.containerRemoveEventName).promise().done(function () {
+                            $.ajax({
+                                type: localOptions.ajaxMethodType,
+                                async: true,
+                                cache: localOptions.ajaxCache,
+                                dataType: localOptions.ajaxDataType,
+                                url: $this.attr("href"),
+                                data: localOptions.ajaxDefaultData,
+                                beforeSend: function (jqXHR, settings) {
+                                    if ($.isFunction(localOptions.ajaxBeforeSend)) {
+                                        return localOptions.ajaxBeforeSend.call(localOptions, jqXHR, settings);
+                                    }
+                                },
+                                success: function (response, textStatus, jqXHR) {
+                                    if ($.isFunction(localOptions.ajaxSuccess)) {
+                                        return localOptions.ajaxSuccess.call(localOptions, response, textStatus, jqXHR);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    if ($.isFunction(localOptions.ajaxError)) {
+                                        return localOptions.ajaxError.call(localOptions, jqXHR, textStatus, errorThrown);
+                                    }
+                                }
                             });
                         });
-                    }
-                });
+                    });
+                }
             };
 
             BootstrapActionable.prototype.populateByLinkEvent = function (populateOptions) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-actionable",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "description": "Actionable plugin is a small Javascript code that help implement click actions for a and button tags by declarative way and provide functionalities to load AJAX content in Bootstrap Modal Wrapper instance.",
     "keywords": [
         "bootstrap",