From: Olaf Braun Date: Tue, 15 Oct 2024 13:33:24 +0000 (+0200) Subject: Add Emoji button after italic and before the link X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90b53512a725d00b9ed0ea0f618cff87440431cb;p=GitHub%2FWoltLab%2FWCF.git Add Emoji button after italic and before the link --- diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts index eada24370f..47d49594b9 100644 --- a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts +++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts @@ -35,7 +35,7 @@ class ConfigurationBuilder { } #setupBasicFormat(): void { - this.#toolbar.push("bold", "italic"); + this.#toolbar.push("bold", "italic", "WoltlabEmoji"); } #setupTextFormat(): void { @@ -182,7 +182,6 @@ class ConfigurationBuilder { } else { this.#removePlugins.push("Table", "TableToolbar"); } - this.#toolbar.push("WoltlabEmoji"); if (this.#features.quoteBlock) { this.#toolbar.push("blockQuote"); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js index 5711c6b542..c7fa3f1dda 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js @@ -10,7 +10,7 @@ define(["require", "exports", "../../Language"], function (require, exports, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); - exports.createConfigurationFor = createConfigurationFor; + exports.createConfigurationFor = void 0; class ConfigurationBuilder { #features; #divider = "|"; @@ -29,7 +29,7 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan } } #setupBasicFormat() { - this.#toolbar.push("bold", "italic"); + this.#toolbar.push("bold", "italic", "WoltlabEmoji"); } #setupTextFormat() { const items = []; @@ -168,7 +168,6 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan else { this.#removePlugins.push("Table", "TableToolbar"); } - this.#toolbar.push("WoltlabEmoji"); if (this.#features.quoteBlock) { this.#toolbar.push("blockQuote"); } @@ -330,4 +329,5 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan configuration.build(); return configuration.toConfig(); } + exports.createConfigurationFor = createConfigurationFor; });