From 57f38a8b6b34e997a644305410b82c54624c3be2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 30 Oct 2020 11:36:13 +0100 Subject: [PATCH] Add missing return types to Ajax callbacks --- .../install/files/ts/WoltLabSuite/Core/BackgroundQueue.ts | 4 ++-- .../files/ts/WoltLabSuite/Core/Ui/Article/MarkAllAsRead.ts | 6 +++--- .../install/files/ts/WoltLabSuite/Core/Ui/Article/Search.ts | 4 ++-- wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dialog.ts | 3 ++- .../install/files/ts/WoltLabSuite/Core/Ui/File/Delete.ts | 4 ++-- .../install/files/ts/WoltLabSuite/Core/Ui/Page/Search.ts | 4 ++-- .../files/ts/WoltLabSuite/Core/Ui/Page/Search/Input.ts | 2 +- .../install/files/ts/WoltLabSuite/Core/Ui/Search/Input.ts | 4 ++-- .../install/files/ts/WoltLabSuite/Core/Ui/Suggestion.ts | 4 ++-- .../install/files/ts/WoltLabSuite/Core/Ui/User/Editor.ts | 6 +++--- wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/List.ts | 4 ++-- .../files/ts/WoltLabSuite/Core/Ui/User/Trophy/List.ts | 4 ++-- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/BackgroundQueue.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/BackgroundQueue.ts index c9dc8d0742..7bf70a73a7 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/BackgroundQueue.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/BackgroundQueue.ts @@ -8,7 +8,7 @@ */ import * as Ajax from "./Ajax"; -import { AjaxCallbackObject, RequestOptions, ResponseData } from "./Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup, ResponseData } from "./Ajax/Data"; class BackgroundQueue implements AjaxCallbackObject { private _invocations = 0; @@ -42,7 +42,7 @@ class BackgroundQueue implements AjaxCallbackObject { } } - _ajaxSetup(): RequestOptions { + _ajaxSetup(): ReturnType { return { url: this._url, ignoreError: true, diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/MarkAllAsRead.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/MarkAllAsRead.ts index f0a561f8da..ff81434f19 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/MarkAllAsRead.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/MarkAllAsRead.ts @@ -8,7 +8,7 @@ */ import * as Ajax from "../../Ajax"; -import { AjaxCallbackObject } from "../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup } from "../../Ajax/Data"; class UiArticleMarkAllAsRead implements AjaxCallbackObject { constructor() { @@ -23,7 +23,7 @@ class UiArticleMarkAllAsRead implements AjaxCallbackObject { Ajax.api(this); } - _ajaxSuccess() { + _ajaxSuccess(): void { /* remove obsolete badges */ // main menu const badge = document.querySelector(".mainMenu .active .badge"); @@ -33,7 +33,7 @@ class UiArticleMarkAllAsRead implements AjaxCallbackObject { document.querySelectorAll(".articleList .newMessageBadge").forEach((el) => el.remove()); } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { data: { actionName: "markAllAsRead", diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/Search.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/Search.ts index 4ff65ee804..99ba488e3e 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/Search.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Article/Search.ts @@ -1,5 +1,5 @@ import * as Ajax from "../../Ajax"; -import { AjaxCallbackObject, DatabaseObjectActionResponse } from "../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup, DatabaseObjectActionResponse } from "../../Ajax/Data"; import { DialogCallbackObject } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; import * as Language from "../../Language"; @@ -85,7 +85,7 @@ class UiArticleSearch implements AjaxCallbackObject, DialogCallbackObject { } } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { data: { actionName: "search", diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dialog.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dialog.ts index 241a7ff5b6..8f10490c43 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dialog.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Dialog.ts @@ -24,6 +24,7 @@ import * as Language from "../Language"; import * as Environment from "../Environment"; import * as EventHandler from "../Event/Handler"; import UiDropdownSimple from "./Dropdown/Simple"; +import { CallbackSetup } from "../Ajax/Data"; let _activeDialog: string | null = null; let _callbackFocus: (event: FocusEvent) => void; @@ -886,7 +887,7 @@ const UiDialog = { return id.toString(); }, - _ajaxSetup() { + _ajaxSetup(): ReturnType { return {}; }, }; diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/File/Delete.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/File/Delete.ts index c62417475e..19a48e918c 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/File/Delete.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/File/Delete.ts @@ -9,7 +9,7 @@ */ import * as Ajax from "../../Ajax"; -import { AjaxCallbackObject, DatabaseObjectActionResponse } from "../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup, DatabaseObjectActionResponse } from "../../Ajax/Data"; import * as Core from "../../Core"; import DomChangeListener from "../../Dom/Change/Listener"; import * as Language from "../../Language"; @@ -163,7 +163,7 @@ class UiFileDelete implements AjaxCallbackObject { Core.triggerEvent(this.target, "change"); } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { url: "index.php?ajax-file-delete/&t=" + window.SECURITY_TOKEN, }; diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search.ts index c2a3054b35..b0ed37d9f2 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search.ts @@ -1,5 +1,5 @@ import * as Ajax from "../../Ajax"; -import { AjaxCallbackObject, DatabaseObjectActionResponse } from "../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup, DatabaseObjectActionResponse } from "../../Ajax/Data"; import { DialogCallbackObject } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; import * as Language from "../../Language"; @@ -89,7 +89,7 @@ class UiPageSearch implements AjaxCallbackObject, DialogCallbackObject { } } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { data: { actionName: "search", diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search/Input.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search/Input.ts index f75e455113..f027992a8a 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search/Input.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Page/Search/Input.ts @@ -58,7 +58,7 @@ class UiPageSearchInput extends UiSearchInput { return data; } - _ajaxSuccess(data) { + _ajaxSuccess(data): void { this.callbackSuccess(data); } } diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Search/Input.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Search/Input.ts index d92d2a2321..1ab9c20fce 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Search/Input.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Search/Input.ts @@ -11,7 +11,7 @@ import * as Ajax from "../../Ajax"; import * as Core from "../../Core"; import DomUtil from "../../Dom/Util"; import UiDropdownSimple from "../Dropdown/Simple"; -import { DatabaseObjectActionPayload, DatabaseObjectActionResponse } from "../../Ajax/Data"; +import { CallbackSetup, DatabaseObjectActionPayload, DatabaseObjectActionResponse } from "../../Ajax/Data"; import AjaxRequest from "../../Ajax/Request"; import { CallbackDropdownInit, CallbackSelect, SearchInputOptions } from "./Data"; @@ -359,7 +359,7 @@ class UiSearchInput { return listItem; } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { data: this.ajaxPayload, }; diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Suggestion.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Suggestion.ts index a1e9752ae0..28887bdae2 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Suggestion.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/Suggestion.ts @@ -11,9 +11,9 @@ import * as Ajax from "../Ajax"; import * as Core from "../Core"; import { AjaxCallbackObject, + CallbackSetup, DatabaseObjectActionPayload, DatabaseObjectActionResponse, - RequestPayload, } from "../Ajax/Data"; import UiDropdownSimple from "./Dropdown/Simple"; @@ -187,7 +187,7 @@ class UiSuggestion implements AjaxCallbackObject { }); } - _ajaxSetup(): RequestPayload { + _ajaxSetup(): ReturnType { return { data: this.ajaxPayload, }; diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Editor.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Editor.ts index e11794dce3..b4ea7e318f 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Editor.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Editor.ts @@ -8,7 +8,7 @@ */ import * as Ajax from "../../Ajax"; -import { AjaxCallbackObject } from "../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup } from "../../Ajax/Data"; import * as Core from "../../Core"; import { DialogCallbackObject, DialogSettings } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; @@ -119,7 +119,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { }); } - _ajaxSuccess(data) { + _ajaxSuccess(data): void { let button: HTMLElement; switch (data.actionName) { case "ban": @@ -183,7 +183,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { UiNotification.show(); } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { data: { className: "wcf\\data\\user\\UserAction", diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/List.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/List.ts index 3113ffb405..bba9ccc98d 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/List.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/List.ts @@ -12,7 +12,7 @@ import * as Core from "../../Core"; import DomUtil from "../../Dom/Util"; import UiDialog from "../Dialog"; import UiPagination from "../Pagination"; -import { AjaxCallbackObject, DatabaseObjectActionResponse, RequestOptions } from "../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup, DatabaseObjectActionResponse } from "../../Ajax/Data"; import { DialogCallbackObject, DialogData, DialogSettings } from "../Dialog/Data"; /** @@ -98,7 +98,7 @@ class UiUserList implements AjaxCallbackObject, DialogCallbackObject { this.showPage(); } - _ajaxSetup(): RequestOptions { + _ajaxSetup(): ReturnType { return { data: { actionName: "getGroupedUserList", diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Trophy/List.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Trophy/List.ts index 73458a6115..b48c48d79c 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Trophy/List.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Ui/User/Trophy/List.ts @@ -8,7 +8,7 @@ */ import * as Ajax from "../../../Ajax"; -import { AjaxCallbackObject, DatabaseObjectActionResponse } from "../../../Ajax/Data"; +import { AjaxCallbackObject, CallbackSetup, DatabaseObjectActionResponse } from "../../../Ajax/Data"; import { DialogCallbackObject, DialogData } from "../../Dialog/Data"; import DomChangeListener from "../../../Dom/Change/Listener"; import UiDialog from "../../Dialog"; @@ -124,7 +124,7 @@ class UiUserTrophyList implements AjaxCallbackObject, DialogCallbackObject { this.showPage(); } - _ajaxSetup() { + _ajaxSetup(): ReturnType { return { data: { actionName: "getGroupedUserTrophyList", -- 2.20.1