Merge branch 'master' into ckeditor
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 22 Feb 2023 18:10:39 +0000 (19:10 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 22 Feb 2023 18:10:39 +0000 (19:10 +0100)
1  2 
package-lock.json
package.json
ts/global.d.ts
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index f0e0b1bbf41e24ab38890eff0c6a530e991eaefd,dfc3d3d1c1073ea36f82b791e024ffb0e5e59f23..7f39397cfa4efe2e0cead9ee92e6c784fdf0de52
@@@ -6,12 -6,8 +6,11 @@@
    "packages": {
      "": {
        "name": "@woltlab/wcf",
-       "version": "6.0.0",
        "dependencies": {
 +        "@ckeditor/ckeditor5-inspector": "^4.1.0",
          "@googlemaps/markerclusterer": "^2.0.15",
 +        "@types/ckeditor__ckeditor5-core": "^33.0.3",
 +        "@types/ckeditor__ckeditor5-editor-classic": "^27.1.2",
          "@types/facebook-js-sdk": "^3.3.6",
          "@types/google.maps": "^3.51.1",
          "@types/jquery": "^3.5.14",
diff --cc package.json
Simple merge
diff --cc ts/global.d.ts
index 0000000000000000000000000000000000000000,d9edb89d909d8db715e92a9c29a8ff14c5f58a65..c2eba8e602c8745fcee788a48e2535ecf5562f62
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,130 +1,135 @@@
 -    redactor(...args: any[]): unknown;
 -
+ import DatePicker from "WoltLabSuite/Core/Date/Picker";
+ import Devtools from "WoltLabSuite/Core/Devtools";
+ import DomUtil from "WoltLabSuite/Core/Dom/Util";
+ import * as ColorUtil from "WoltLabSuite/Core/ColorUtil";
+ import * as EventHandler from "WoltLabSuite/Core/Event/Handler";
+ import UiDropdownSimple from "WoltLabSuite/Core/Ui/Dropdown/Simple";
+ import "@woltlab/zxcvbn";
+ import { Reaction } from "WoltLabSuite/Core/Ui/Reaction/Data";
+ import type WoltlabCoreDialogElement from "WoltLabSuite/Core/Element/woltlab-core-dialog";
+ import type WoltlabCoreDialogControlElement from "WoltLabSuite/Core/Element/woltlab-core-dialog-control";
+ import type WoltlabCoreGoogleMapsElement from "WoltLabSuite/Core/Component/GoogleMaps/woltlab-core-google-maps";
++import type ClassicEditor from "@ckeditor/ckeditor5-editor-classic/src/classiceditor";
++import type { EditorConfig } from "@ckeditor/ckeditor5-core/src/editor/editorconfig";
+ type Codepoint = string;
+ type HasRegularVariant = boolean;
+ type IconMetadata = [Codepoint, HasRegularVariant];
+ type IconSize = 16 | 24 | 32 | 48 | 64 | 96 | 128 | 144;
+ type LoadingIndicatorIconSize = 24 | 48 | 96;
++interface CKEditor5 {
++  create(element: HTMLElement, configuration: EditorConfig): Promise<ClassicEditor>;
++}
++
+ declare global {
+   interface WoltLabTemplate {
+     fetch(v: object): string;
+   }
+   interface Window {
++    CKEditor5: CKEditor5;
+     Devtools?: typeof Devtools;
+     ENABLE_DEBUG_MODE: boolean;
+     ENABLE_DEVELOPER_TOOLS: boolean;
+     LANGUAGE_ID: number;
+     PAGE_TITLE: string;
+     REACTION_TYPES: {
+       [key: string]: Reaction;
+     };
+     TIME_NOW: number;
+     WCF_PATH: string;
+     WSC_API_URL: string;
+     getFontAwesome6Metadata: () => Map<string, IconMetadata>;
+     getFontAwesome6IconMetadata: (name: string) => IconMetadata | undefined;
+     jQuery: JQueryStatic;
+     WCF: any;
+     bc_wcfDomUtil: typeof DomUtil;
+     bc_wcfSimpleDropdown: typeof UiDropdownSimple;
+     __wcf_bc_colorPickerInit?: () => void;
+     __wcf_bc_colorUtil: typeof ColorUtil;
+     __wcf_bc_datePicker: typeof DatePicker;
+     __wcf_bc_eventHandler: typeof EventHandler;
+     WoltLabLanguage: {
+       getPhrase(key: string, parameters?: object): string;
+       registerPhrase(key: string, value: string): void;
+     };
+     WoltLabTemplate: new (template: string) => WoltLabTemplate;
+   }
+   interface String {
+     hashCode: () => string;
+   }
+   interface JQuery {
+     sortable(...args: any[]): unknown;
+     messageTabMenu(...args: any[]): unknown;
+   }
+   type ArbitraryObject = Record<string, unknown>;
+   class HTMLParsedElement extends HTMLElement {
+     parsedCallback(): void;
+   }
+   interface FaBrand extends HTMLElement {
+     size: IconSize;
+   }
+   interface FaIcon extends HTMLElement {
+     readonly name: string;
+     readonly solid: boolean;
+     size: IconSize;
+     setIcon: (name: string, forceSolid?: boolean) => void;
+   }
+   interface WoltlabCoreDateTime extends HTMLElement {
+     static: boolean;
+     get date(): Date;
+     set date(date: Date);
+   }
+   interface WoltlabCoreLoadingIndicatorElement extends HTMLElement {
+     get size(): LoadingIndicatorIconSize;
+     set size(size: LoadingIndicatorIconSize);
+     get hideText(): boolean;
+     set hideText(hideText: boolean);
+   }
+   interface WoltlabCoreReactionSummaryElement extends HTMLElement {
+     get objectId(): number;
+     get objectType(): string;
+     setData: (data: Map<number, number>, selectedReaction?: number) => void;
+   }
+   interface WoltlabCorePaginationElement extends HTMLElement {
+     getLinkUrl(page: number): string;
+     jumpToPage(page: number): void;
+     get count(): number;
+     set count(count: number);
+     get page(): number;
+     set page(page: number);
+     get url(): string;
+     set url(url: string);
+   }
+   interface HTMLElementTagNameMap {
+     "fa-brand": FaBrand;
+     "fa-icon": FaIcon;
+     "woltlab-core-dialog": WoltlabCoreDialogElement;
+     "woltlab-core-dialog-control": WoltlabCoreDialogControlElement;
+     "woltlab-core-date-time": WoltlabCoreDateTime;
+     "woltlab-core-loading-indicator": WoltlabCoreLoadingIndicatorElement;
+     "woltlab-core-pagination": WoltlabCorePaginationElement;
+     "woltlab-core-google-maps": WoltlabCoreGoogleMapsElement;
+     "woltlab-core-reaction-summary": WoltlabCoreReactionSummaryElement;
+   }
+ }
Simple merge
Simple merge