Replace implicit `any` variables

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js
index 8ca05bf7ac00723b1bb8b87cd7132e320f49f240..b634a8e91eda7b1ea8e636408ae3ac193d416a96 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js
@@ -224,7 +224,6 @@ define(["require", "exports", "tslib", "../../CallbackList", "../../Core", "../.
         }
     }
     function dropdownMenuKeyDown(event) {
-        let button, dropdown;
         const activeItem = document.activeElement;
         if (activeItem.nodeName !== 'LI') {
             return;
@@ -262,17 +261,18 @@ define(["require", "exports", "tslib", "../../CallbackList", "../../Core", "../.
             if (target.childElementCount === 1 && (target.children[0].nodeName === 'SPAN' || target.children[0].nodeName === 'A')) {
                 target = target.children[0];
             }
-            dropdown = _dropdowns.get(_activeTargetId);
-            button = dropdown.querySelector('.dropdownToggle');
+            const dropdown = _dropdowns.get(_activeTargetId);
+            const button = dropdown.querySelector('.dropdownToggle');
             const mouseEvent = dropdown.dataset.a11yMouseEvent || 'click';
             Core.triggerEvent(target, mouseEvent);
-            if (button)
+            if (button) {
                 button.focus();
+            }
         }
         else if (event.key === 'Escape' || event.key === 'Tab') {
             event.preventDefault();
-            dropdown = _dropdowns.get(_activeTargetId);
-            button = dropdown.querySelector('.dropdownToggle');
+            const dropdown = _dropdowns.get(_activeTargetId);
+            let button = dropdown.querySelector('.dropdownToggle');
             // Remote controlled drop-down menus may not have a dedicated toggle button, instead the
             // `dropdown` element itself is the button.
             if (button === null && !dropdown.classList.contains('dropdown')) {
@@ -504,7 +504,7 @@ define(["require", "exports", "tslib", "../../CallbackList", "../../Core", "../.
         // Legacy call required for `WCF.Dropdown`
         _toggle(event, targetId, alternateElement, disableAutoFocus) {
             return toggle(event, targetId, alternateElement, disableAutoFocus);
-        }
+        },
     };
     return UiDropdownSimple;
 });

diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts
index d2b40222330c989abef877dbf5fa905c1ee07d47..22be28fcb8640ac8cf9c44f2d4920c3905ca25fe 100644 (file)
--- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts
+++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts
@@ -251,8 +251,6 @@ function handleKeyDown(event: KeyboardEvent): void {
 }
 
 function dropdownMenuKeyDown(event: KeyboardEvent): void {
-  let button, dropdown;
-
   const activeItem = document.activeElement as HTMLElement;
   if (activeItem.nodeName !== 'LI') {
     return;
@@ -298,18 +296,21 @@ function dropdownMenuKeyDown(event: KeyboardEvent): void {
       target = target.children[0] as HTMLElement;
     }
 
-    dropdown = _dropdowns.get(_activeTargetId);
-    button = dropdown.querySelector('.dropdownToggle');
+    const dropdown = _dropdowns.get(_activeTargetId)!;
+    const button = dropdown.querySelector('.dropdownToggle') as HTMLElement;
 
     const mouseEvent = dropdown.dataset.a11yMouseEvent || 'click';
     Core.triggerEvent(target, mouseEvent);
 
-    if (button) button.focus();
+    if (button) {
+      button.focus();
+    }
   } else if (event.key === 'Escape' || event.key === 'Tab') {
     event.preventDefault();
 
-    dropdown = _dropdowns.get(_activeTargetId);
-    button = dropdown.querySelector('.dropdownToggle');
+    const dropdown = _dropdowns.get(_activeTargetId)!;
+    let button: HTMLElement | null = dropdown.querySelector('.dropdownToggle');
+
     // Remote controlled drop-down menus may not have a dedicated toggle button, instead the
     // `dropdown` element itself is the button.
     if (button === null && !dropdown.classList.contains('dropdown')) {
@@ -587,7 +588,7 @@ const UiDropdownSimple = {
   // Legacy call required for `WCF.Dropdown`
   _toggle(event: KeyboardEvent | MouseEvent | null, targetId?: string, alternateElement?: HTMLElement, disableAutoFocus?: boolean): boolean {
     return toggle(event, targetId, alternateElement, disableAutoFocus);
-  }
+  },
 };
 
 export = UiDropdownSimple;