Do not keep processing the file/folder paths if the user has cancelled the operation and fix #1124 (#1177)

CHANGELOG.md

@@ -17,6 +17,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Fixes tokens being sent to users when their account is created to actually work. Implements Laravel's internal token creation mechanisms rather than trying to do it custom.
 * Updates some eggs to ensure they have the correct data and will continue working down the road. Fixes autoupdating on some source servers and MC related download links.
 * Emails should send properly now when a server is marked as installed to let the owner know it is ready for action.
+* Cancelling a file manager operation should cancel correctly across all browsers now.
 
 ### Changed
 * Attempting to upload a folder via the web file manager will now display a warning telling the user to use SFTP.

public/themes/pterodactyl/js/frontend/files/src/actions.js

@@ -55,6 +55,10 @@ class ActionsClass {
             showLoaderOnConfirm: true,
             inputValue: inputValue
         }, (val) => {
+            if (val === false) {
+                return false;
+            }
+
             $.ajax({
                 type: 'POST',
                 headers: {
@@ -100,6 +104,10 @@ class ActionsClass {
             showLoaderOnConfirm: true,
             inputValue: `${currentPath}${currentName}`,
         }, (val) => {
+            if (val === false) {
+                return false;
+            }
+
             $.ajax({
                 type: 'POST',
                 headers: {
@@ -233,6 +241,10 @@ class ActionsClass {
             showLoaderOnConfirm: true,
             inputValue: `${currentPath}${currentName}`,
         }, (val) => {
+            if (val === false) {
+                return false;
+            }
+
             $.ajax({
                 type: 'POST',
                 headers: {

resources/themes/pterodactyl/server/files/index.blade.php

@@ -44,7 +44,7 @@
     {!! Theme::js('vendor/lodash/lodash.js') !!}
     {!! Theme::js('vendor/siofu/client.min.js') !!}
     @if(App::environment('production'))
-        {!! Theme::js('js/frontend/files/filemanager.min.js') !!}
+        {!! Theme::js('js/frontend/files/filemanager.min.js?updated-cancel-buttons') !!}
     @else
         {!! Theme::js('js/frontend/files/src/index.js') !!}
         {!! Theme::js('js/frontend/files/src/contextmenu.js') !!}