VACMS-19377: Removed form changes from patch file.

department-of-veterans-affairs · Nov 13, 2024 · e6ad25a · e6ad25a
1 parent 3252409
commit e6ad25a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -371,7 +371,7 @@
         "patches-ignore": {},
         "patches": {
             "drupal/admin_toolbar": {
-                "VACMS-19377 - Tabbing order does not satisfy 508 accessibility requirements for content editors": "patches/3286466-54-admin-toolbar-keyboard-navigation-fix.patch"
+                "VACMS-19377 - Tabbing order does not satisfy 508 accessibility requirements for content editors": "patches/3286466-admin-toolbar-keyboard-navigation-fix.patch"
             },
             "drupal/cer": {
                 "3200122 - Remove delete hook": "patches/3200122-delete-hook-added-in-dev-causes-test-failures.patch",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "126682f12d1194d6df711c676e3f9fec",
+    "content-hash": "73f14a57c3db40cae5075804c40d9132",
     "packages": [
         {
             "name": "asm89/stack-cors",

diff --git a/...min-toolbar-keyboard-navigation-fix.patch → ...min-toolbar-keyboard-navigation-fix.patch b/...min-toolbar-keyboard-navigation-fix.patch → ...min-toolbar-keyboard-navigation-fix.patch
@@ -484,15 +484,4 @@ index a714c6e..36cff2f 100644
        if (window.matchMedia("(max-width: 767px)").matches && $('body').hasClass('toolbar-tray-open')) {
          $('body').removeClass('toolbar-tray-open');
          $('#toolbar-item-administration').removeClass('is-active');
-diff --git a/src/Form/AdminToolbarSettingsForm.php b/src/Form/AdminToolbarSettingsForm.php
-index 575f5e6..a0f0eda 100644
---- a/src/Form/AdminToolbarSettingsForm.php
-+++ b/src/Form/AdminToolbarSettingsForm.php
-@@ -76,6 +82,7 @@ class AdminToolbarSettingsForm extends ConfigFormBase {
-   public function submitForm(array &$form, FormStateInterface $form_state) {
-     $this->config('admin_toolbar.settings')
-       ->set('menu_depth', $form_state->getValue('menu_depth'))
-+      ->set('remove_keyboard_accessibility', $form_state->getValue('remove_keyboard_accessibility'))
-       ->save();
-     parent::submitForm($form, $form_state);
-     $this->cacheMenu->invalidateAll();
+