Add returnFocus option to resolve focus issues in file_ops (#4100)

* Fix modal bug when file transfer fails * Add returnFocus option to resolve focus conflict in file ops * Remove returnFocus parameter and set to false by default
OSC · Feb 18, 2025 · f55209a · f55209a
1 parent 1bf5847
commit f55209a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/dashboard/app/javascript/files/file_ops.js b/apps/dashboard/app/javascript/files/file_ops.js
@@ -525,7 +525,7 @@ class FileOps {
     .then(() => this.doneLoading())
     .catch(e => {
       this.doneLoading();
-      this.alertError('Error occurred when attempting to ' + summary, e.message)
+      this.alertError('Error occurred when attempting to ' + summary, e.message);
     })
   }
 
@@ -653,7 +653,7 @@ class FileOps {
     $(CONTENTID).trigger(DATATABLE_EVENTNAME.reloadTable, eventData);
   }
 
-  showSwalLoading (message) {
+  showSwalLoading(message) {
     const eventData = {
       'message': message,
     };

diff --git a/apps/dashboard/app/javascript/files/sweet_alert.js b/apps/dashboard/app/javascript/files/sweet_alert.js
@@ -82,6 +82,7 @@ class SweetAlert {
       title: title,
       allowOutsideClick: false,
       showConfirmButton: false,
+      returnFocus: false,
       willOpen: () => { Swal.showLoading()  }
     });
   }