Skip to content

Commit 0b737f9

Browse files
committed
clean and remove promise on triggerHandler
1 parent 7a72f45 commit 0b737f9

File tree

3 files changed

+31
-34
lines changed

3 files changed

+31
-34
lines changed

dist/bootstrap-actionable.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/bootstrap-actionable.js

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -109,39 +109,36 @@
109109
var event = localOptions.linkEvent;
110110
event.preventDefault();
111111
var removeEvent = $.Event(localOptions.containerRemoveEventName, {_newTarget: $this});
112-
$(localOptions.outputElement).triggerHandler(removeEvent).promise().done(function () {
113-
if (!removeEvent.isDefaultPrevented()) {
114-
$(localOptions.outputElement).off(localOptions.containerReadyEventName).promise().done(function () {
115-
$(localOptions.outputElement).off(localOptions.containerRemoveEventName).promise().done(function () {
116-
$(localOptions.outputElement).off(removeEvent).promise().done(function () {
117-
$.ajax({
118-
type: localOptions.ajaxMethodType,
119-
async: true,
120-
cache: localOptions.ajaxCache,
121-
dataType: localOptions.ajaxDataType,
122-
url: $this.attr("href"),
123-
data: localOptions.ajaxDefaultData,
124-
beforeSend: function (jqXHR, settings) {
125-
if ($.isFunction(localOptions.ajaxBeforeSend)) {
126-
return localOptions.ajaxBeforeSend.call(localOptions, jqXHR, settings);
127-
}
128-
},
129-
success: function (response, textStatus, jqXHR) {
130-
if ($.isFunction(localOptions.ajaxSuccess)) {
131-
return localOptions.ajaxSuccess.call(localOptions, response, textStatus, jqXHR);
132-
}
133-
},
134-
error: function (jqXHR, textStatus, errorThrown) {
135-
if ($.isFunction(localOptions.ajaxError)) {
136-
return localOptions.ajaxError.call(localOptions, jqXHR, textStatus, errorThrown);
137-
}
138-
}
139-
});
140-
});
112+
var removeResponse = $(localOptions.outputElement).triggerHandler(removeEvent);
113+
if (!removeEvent.isDefaultPrevented()) {
114+
$(localOptions.outputElement).off(localOptions.containerReadyEventName).promise().done(function () {
115+
$(localOptions.outputElement).off(localOptions.containerRemoveEventName).promise().done(function () {
116+
$.ajax({
117+
type: localOptions.ajaxMethodType,
118+
async: true,
119+
cache: localOptions.ajaxCache,
120+
dataType: localOptions.ajaxDataType,
121+
url: $this.attr("href"),
122+
data: localOptions.ajaxDefaultData,
123+
beforeSend: function (jqXHR, settings) {
124+
if ($.isFunction(localOptions.ajaxBeforeSend)) {
125+
return localOptions.ajaxBeforeSend.call(localOptions, jqXHR, settings);
126+
}
127+
},
128+
success: function (response, textStatus, jqXHR) {
129+
if ($.isFunction(localOptions.ajaxSuccess)) {
130+
return localOptions.ajaxSuccess.call(localOptions, response, textStatus, jqXHR);
131+
}
132+
},
133+
error: function (jqXHR, textStatus, errorThrown) {
134+
if ($.isFunction(localOptions.ajaxError)) {
135+
return localOptions.ajaxError.call(localOptions, jqXHR, textStatus, errorThrown);
136+
}
137+
}
141138
});
142139
});
143-
}
144-
});
140+
});
141+
}
145142
};
146143

147144
BootstrapActionable.prototype.populateByLinkEvent = function (populateOptions) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-actionable",
3-
"version": "1.0.10",
3+
"version": "1.0.11",
44
"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.",
55
"keywords": [
66
"bootstrap",

0 commit comments

Comments
 (0)