Skip the mention plugins when disabled

diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
index 10edf00c8304ed232a2f70d56d69a5a82ed7ae17..e6d032651b31cfd7d6bcfca16b26f60c0834491d 100644 (file)
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
@@ -183,6 +183,12 @@ class ConfigurationBuilder {
     this.#toolbar.push(this.#divider);
   }
 
+  #setupMention(): void {
+    if (!this.#features.mention) {
+      this.#removePlugins.push("Mention", "WoltlabMention");
+    }
+  }
+
   #getToolbar(): ToolbarConfig {
     let allowDivider = false;
     const toolbar = this.#toolbar.filter((item) => {
@@ -225,6 +231,8 @@ class ConfigurationBuilder {
     this.#setupBlocks();
 
     this.#insertDivider();
+
+    this.#setupMention();
   }
 
   toConfig(): EditorConfig {

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 92bbcf431e537eeb1d08c4ba2c2bec6b3f6c5138..215b9dafe70024c168488ba082a5e00670302343 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
@@ -167,6 +167,11 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan
         #insertDivider() {
             this.#toolbar.push(this.#divider);
         }
+        #setupMention() {
+            if (!this.#features.mention) {
+                this.#removePlugins.push("Mention", "WoltlabMention");
+            }
+        }
         #getToolbar() {
             let allowDivider = false;
             const toolbar = this.#toolbar.filter((item) => {
@@ -197,6 +202,7 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan
             this.#setupImage();
             this.#setupBlocks();
             this.#insertDivider();
+            this.#setupMention();
         }
         toConfig() {
             // TODO: The typings are both incompleted and outdated.