Skip to content

Commit ecd911c

Browse files
committed
Handle modal helpers parameter order
1 parent 11fe997 commit ecd911c

File tree

1 file changed

+47
-15
lines changed

1 file changed

+47
-15
lines changed

liens-morts-detector-jlg/assets/js/blc-admin-scripts.js

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,9 @@ jQuery(document).ready(function($) {
20282028

20292029
modal.open($.extend({}, modalConfig, {
20302030
onConfirm: function(_value, helpers) {
2031-
helpers.setSubmitting(true);
2031+
if (helpers && typeof helpers.setSubmitting === 'function') {
2032+
helpers.setSubmitting(true);
2033+
}
20322034
$(document).trigger('blcAdmin:bulkActionConfirmed', {
20332035
action: action,
20342036
count: $selected.length,
@@ -2573,7 +2575,19 @@ jQuery(document).ready(function($) {
25732575
cancelText: messages.cancelButton,
25742576
closeLabel: messages.closeLabel,
25752577
onConfirm: function(_value, helpers) {
2576-
helpers.setSubmitting(true);
2578+
var modalHelpers = helpers || {};
2579+
var setSubmitting = (modalHelpers && typeof modalHelpers.setSubmitting === 'function')
2580+
? modalHelpers.setSubmitting.bind(modalHelpers)
2581+
: function() {};
2582+
var showError = (modalHelpers && typeof modalHelpers.showError === 'function')
2583+
? modalHelpers.showError.bind(modalHelpers)
2584+
: function(message) {
2585+
if (message) {
2586+
window.alert(message);
2587+
}
2588+
};
2589+
2590+
setSubmitting(true);
25772591

25782592
var row = linkElement.closest('tr');
25792593
row.css('opacity', 0.5);
@@ -2587,18 +2601,18 @@ jQuery(document).ready(function($) {
25872601
_ajax_nonce: nonce
25882602
}).done(function(response) {
25892603
if (response && response.success) {
2590-
handleSuccessfulResponse(response, row, helpers);
2604+
handleSuccessfulResponse(response, row, modalHelpers);
25912605
} else {
25922606
var errorMessage = response && response.data && response.data.message
25932607
? response.data.message
25942608
: messages.genericError;
2595-
helpers.setSubmitting(false);
2596-
helpers.showError((messages.errorPrefix || '') + errorMessage);
2609+
setSubmitting(false);
2610+
showError((messages.errorPrefix || '') + errorMessage);
25972611
row.css('opacity', 1);
25982612
}
25992613
}).fail(function() {
2600-
helpers.setSubmitting(false);
2601-
helpers.showError(messages.genericError);
2614+
setSubmitting(false);
2615+
showError(messages.genericError);
26022616
row.css('opacity', 1);
26032617
});
26042618
}
@@ -2637,7 +2651,11 @@ jQuery(document).ready(function($) {
26372651
contextHtml: contextHtml,
26382652
contextLabel: messages.contextLabel,
26392653
onConfirm: function(_value, helpers) {
2640-
helpers.close();
2654+
if (helpers && typeof helpers.close === 'function') {
2655+
helpers.close();
2656+
} else if (modal && typeof modal.close === 'function') {
2657+
modal.close();
2658+
}
26412659
}
26422660
});
26432661
});
@@ -2684,7 +2702,19 @@ jQuery(document).ready(function($) {
26842702
cancelText: messages.cancelButton,
26852703
closeLabel: messages.closeLabel,
26862704
onConfirm: function(_value, helpers) {
2687-
helpers.setSubmitting(true);
2705+
var modalHelpers = helpers || {};
2706+
var setSubmitting = (modalHelpers && typeof modalHelpers.setSubmitting === 'function')
2707+
? modalHelpers.setSubmitting.bind(modalHelpers)
2708+
: function() {};
2709+
var showError = (modalHelpers && typeof modalHelpers.showError === 'function')
2710+
? modalHelpers.showError.bind(modalHelpers)
2711+
: function(message) {
2712+
if (message) {
2713+
window.alert(message);
2714+
}
2715+
};
2716+
2717+
setSubmitting(true);
26882718

26892719
var row = linkElement.closest('tr');
26902720
row.css('opacity', 0.5);
@@ -2704,18 +2734,18 @@ jQuery(document).ready(function($) {
27042734
if (!response.data.announcement && announcementFallback) {
27052735
response.data.announcement = announcementFallback;
27062736
}
2707-
handleSuccessfulResponse(response, row, helpers);
2737+
handleSuccessfulResponse(response, row, modalHelpers);
27082738
} else {
27092739
var errorMessage = response && response.data && response.data.message
27102740
? response.data.message
27112741
: messages.genericError;
2712-
helpers.setSubmitting(false);
2713-
helpers.showError((messages.errorPrefix || '') + errorMessage);
2742+
setSubmitting(false);
2743+
showError((messages.errorPrefix || '') + errorMessage);
27142744
row.css('opacity', 1);
27152745
}
27162746
}).fail(function() {
2717-
helpers.setSubmitting(false);
2718-
helpers.showError(messages.genericError);
2747+
setSubmitting(false);
2748+
showError(messages.genericError);
27192749
row.css('opacity', 1);
27202750
});
27212751
}
@@ -3512,7 +3542,9 @@ jQuery(document).ready(function($) {
35123542
return $wrapper;
35133543
},
35143544
onConfirm: function(_value, helpers) {
3515-
helpers.setSubmitting(true);
3545+
if (helpers && typeof helpers.setSubmitting === 'function') {
3546+
helpers.setSubmitting(true);
3547+
}
35163548
sendStartRequest(isFullScan, {
35173549
forceCancel: true,
35183550
confirmationHelpers: helpers

0 commit comments

Comments
 (0)