From 29320126f2ae8e8baa26938982d5b634dbe2d9fe Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 27 Jun 2023 16:43:27 +0200 Subject: [PATCH] Disabling images should not disable attachments and smilies See https://www.woltlab.com/community/thread/300270-smiley-hinzuf%C3%BCgen-bei-woltlab-6-0/ See https://www.woltlab.com/community/thread/300284-einf%C3%BCgen-von-bildern-aus-der-zwischenablage-im-editor-nicht-m%C3%B6glich/ --- ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts | 6 +----- .../WoltLabSuite/Core/Component/Ckeditor/Configuration.js | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts index c63223b665..ecf2794137 100644 --- a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts +++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts @@ -151,15 +151,11 @@ class ConfigurationBuilder { this.#removePlugins.push("ImageUpload", "ImageUploadUI", "WoltlabAttachment"); } } else { - this.#removePlugins.push("ImageInsertUI", "ImageToolbar", "ImageStyle", "ImageUpload", "ImageUploadUI"); + this.#removePlugins.push("ImageInsertUI"); if (this.#features.link) { this.#removePlugins.push("LinkImage"); } - - // Disable built-in plugins that rely on the image plugin. - this.#removePlugins.push("WoltlabAttachment"); - this.#removePlugins.push("WoltlabSmiley"); } } 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 50f9699e22..14716a1709 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js @@ -139,13 +139,10 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan } } else { - this.#removePlugins.push("ImageInsertUI", "ImageToolbar", "ImageStyle", "ImageUpload", "ImageUploadUI"); + this.#removePlugins.push("ImageInsertUI"); if (this.#features.link) { this.#removePlugins.push("LinkImage"); } - // Disable built-in plugins that rely on the image plugin. - this.#removePlugins.push("WoltlabAttachment"); - this.#removePlugins.push("WoltlabSmiley"); } } #setupBlocks() { -- 2.20.1