Merge pull request #652 from usdoj/develop

Confirm leave patch into uat
usdoj · Sep 10, 2024 · c104948 · c104948
2 parents 5a86ad2 + 63d11c7
commit c104948
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -205,6 +205,9 @@
             },
             "drupal/lightning_media": {
               "Issue 3456919 - Fixes error in github action test Drupal 10.3": "https://www.drupal.org/files/issues/2024-07-12/mapping-definition-entity-browser-upload-validators-3456919.patch"
+            },
+            "drupal/autologout": {
+              "Avoid problematic interactions with the confirm_leave module": "./patches/autologout-support-for-confirm_leave.patch"
             }
         },
         "installer-types": [

diff --git a/composer.lock b/composer.lock
diff --git a/patches/autologout-support-for-confirm_leave.patch b/patches/autologout-support-for-confirm_leave.patch
@@ -0,0 +1,13 @@
+diff --git a/js/autologout.js b/js/autologout.js
+index ca3fe7e..8c0a4a9 100644
+--- a/js/autologout.js
++++ b/js/autologout.js
+@@ -196,6 +196,8 @@
+       }
+
+       function logout() {
++        // Prevent the confirm_leave module from interfering.
++        window.onbeforeunload = function () {};
+         if (localSettings.use_alt_logout_method) {
+           let logoutUrl = drupalSettings.path.baseUrl + "autologout_alt_logout";
+           triggerLogoutEvent('alternative', logoutUrl);