diff --git a/resources/js/dashboard.js b/resources/js/dashboard.js index 67d523e..7b00d3c 100644 --- a/resources/js/dashboard.js +++ b/resources/js/dashboard.js @@ -48,10 +48,19 @@ function askConfirmation(message, command, cancelCommand) { }, fadeTime); }; + // functionality to run when clicking the cancel button + const cancelModal = function() { + if (cancelCommand !== undefined) { + cancelCommand(); + } + + closeConfirmationModal(); + }; + // close the modal if the escape button is pressed const escapeModal = function(e) { if (e.keyCode === 27) { - closeConfirmationModal(); + cancelModal(); } else { e.preventDefault(); } @@ -63,15 +72,6 @@ function askConfirmation(message, command, cancelCommand) { closeConfirmationModal(); }; - // functionality to run when clicking the cancel button - const cancelModal = function() { - if (cancelCommand !== undefined) { - cancelCommand(); - } - - closeConfirmationModal(); - }; - // hide the modal when the cancel button is pressed $cancelButton.on("click", cancelModal);