Skip to content

Commit

Permalink
Dont send delete request when confirm cancel clicked for naja
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinSzollos2016 authored and paveljanda committed May 27, 2020
1 parent 4bd41a8 commit 17bdd72
Showing 1 changed file with 32 additions and 10 deletions.
42 changes: 32 additions & 10 deletions assets/datagrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ if (typeof naja !== "undefined") {
var success = extension.success;
var before = extension.before;
var complete = extension.complete;
var interaction = extension.interaction;


var NewExtension = function NewExtension(naja, name) {
Expand All @@ -27,6 +28,11 @@ if (typeof naja !== "undefined") {
params.options.nette = {
el: $(params.element)
}
if (interaction) {
if (!interaction(params.options)){
params.preventDefault();
}
}
});

if(before) {
Expand Down Expand Up @@ -93,18 +99,34 @@ $(document).on('click', '[data-datagrid-confirm]:not(.ajax)', function(e) {
}
});

dataGridRegisterExtension('datagrid.confirm', {
before: function(xhr, settings) {
var confirm_message;
if (settings.nette) {
confirm_message = settings.nette.el.data('datagrid-confirm');
if (confirm_message) {
return confirm(confirm_message);
if (typeof naja !== "undefined") {
dataGridRegisterExtension('datagrid.confirm', {
before: function(xhr, settings) {
var confirm_message;
if (settings.nette) {
confirm_message = settings.nette.el.data('datagrid-confirm');
if (confirm_message) {
return confirm(confirm_message);
}
}
return true;
}
return true;
}
});
});
} else {
dataGridRegisterExtension('datagrid.confirm', {
interaction: function(settings) {
var confirm_message;
if (settings.nette) {
confirm_message = settings.nette.el.data('datagrid-confirm');
if (confirm_message) {
return confirm(confirm_message);
}
}
return true;
}
});
}


$(document).on('change', 'select[data-autosubmit-per-page]', function() {
var button;
Expand Down

0 comments on commit 17bdd72

Please sign in to comment.