Issue #3390549 by finnsky, nod_, smustgrave, larowlan, catch, bnjmnm: Get rid of jQuery in dialog events

1 files changed, 16 insertions, 18 deletions

diff --git a/core/modules/settings_tray/js/settings_tray.js b/core/modules/settings_tray/js/settings_tray.js
index 70e5df5a40a..5b627eafc47 100644
--- a/core/modules/settings_tray/js/settings_tray.js
+++ b/core/modules/settings_tray/js/settings_tray.js
@@ -237,24 +237,22 @@
   };
 
   // Manage Active editable class on opening and closing of the dialog.
-  $(window).on({
-    'dialog:beforecreate': (event, dialog, $element, settings) => {
-      if ($element[0].id === 'drupal-off-canvas') {
-        $('body .settings-tray-active-editable').removeClass(
-          'settings-tray-active-editable',
-        );
-        const $activeElement = $(`#${settings.settingsTrayActiveEditableId}`);
-        if ($activeElement.length) {
-          $activeElement.addClass('settings-tray-active-editable');
-        }
-      }
-    },
-    'dialog:beforeclose': (event, dialog, $element) => {
-      if ($element[0].id === 'drupal-off-canvas') {
-        $('body .settings-tray-active-editable').removeClass(
-          'settings-tray-active-editable',
-        );
+  window.addEventListener('dialog:beforecreate', (e) => {
+    if (e.target.id === 'drupal-off-canvas') {
+      $('body .settings-tray-active-editable').removeClass(
+        'settings-tray-active-editable',
+      );
+      const $activeElement = $(`#${e.settings.settingsTrayActiveEditableId}`);
+      if ($activeElement.length) {
+        $activeElement.addClass('settings-tray-active-editable');
       }
-    },
+    }
+  });
+  window.addEventListener('dialog:beforeclose', (e) => {
+    if (e.target.id === 'drupal-off-canvas') {
+      $('body .settings-tray-active-editable').removeClass(
+        'settings-tray-active-editable',
+      );
+    }
   });
 })(jQuery, Drupal);