From 540bdd80528cb679a29810a97e915e2fe9cb5f4f Mon Sep 17 00:00:00 2001
From: Nikita Hovratov <nikita.h@live.de>
Date: Tue, 17 Jan 2023 18:05:26 +0100
Subject: [PATCH] [BUGFIX] Prevent duplicate ckeditor instances when moving
inline fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Resolves: #99410
Releases: 11.5
Change-Id: I354ed27532f7f07ef070488866e685762fe14165
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/77426
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
.../Resources/Public/TypeScript/FormEngineInitializer.ts | 2 --
.../Resources/Public/JavaScript/FormEngineInitializer.js | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Build/Sources/TypeScript/rte_ckeditor/Resources/Public/TypeScript/FormEngineInitializer.ts b/Build/Sources/TypeScript/rte_ckeditor/Resources/Public/TypeScript/FormEngineInitializer.ts
index f88e05a4e578..52d88ebe6919 100644
--- a/Build/Sources/TypeScript/rte_ckeditor/Resources/Public/TypeScript/FormEngineInitializer.ts
+++ b/Build/Sources/TypeScript/rte_ckeditor/Resources/Public/TypeScript/FormEngineInitializer.ts
@@ -65,11 +65,9 @@ export class FormEngineInitializer {
}
});
document.addEventListener('inline:sorting-changed', () => {
- instance.destroy();
CKEDITOR.replace(fieldId, options.configuration);
});
document.addEventListener('formengine:flexform:sorting-changed', () => {
- instance.destroy();
CKEDITOR.replace(fieldId, options.configuration);
});
});
diff --git a/typo3/sysext/rte_ckeditor/Resources/Public/JavaScript/FormEngineInitializer.js b/typo3/sysext/rte_ckeditor/Resources/Public/JavaScript/FormEngineInitializer.js
index 7cfe4652da8c..c13e9be41ec5 100644
--- a/typo3/sysext/rte_ckeditor/Resources/Public/JavaScript/FormEngineInitializer.js
+++ b/typo3/sysext/rte_ckeditor/Resources/Public/JavaScript/FormEngineInitializer.js
@@ -10,4 +10,4 @@
*
* The TYPO3 project - inspiring people to share!
*/
-var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};define(["require","exports","jquery","TYPO3/CMS/Backend/FormEngine"],(function(e,i,t,a){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.FormEngineInitializer=void 0,t=__importDefault(t);i.FormEngineInitializer=class{static initializeCKEditor(i){e(["ckeditor"],e=>{e.timestamp+="-"+i.configurationHash,i.externalPlugins.forEach(i=>e.plugins.addExternal(i.name,i.resource,"")),(0,t.default)(()=>{const n=i.fieldId,o="#"+t.default.escapeSelector(n);e.replace(n,i.configuration);const d=e.instances[n];d.on("change",e=>{let i=e.sender.commands;d.updateElement(),a.Validation.validateField((0,t.default)(o)),a.Validation.markFieldAsChanged((0,t.default)(o)),void 0!==i.maximize&&1===i.maximize.state&&d.on("maximize",e=>{(0,t.default)(this).off("maximize"),a.Validation.markFieldAsChanged((0,t.default)(o))})}),d.on("mode",e=>{if("source"===e.editor.mode){const e=d.editable();e.attachListener(e,"change",()=>{a.Validation.markFieldAsChanged((0,t.default)(o))})}}),document.addEventListener("inline:sorting-changed",()=>{d.destroy(),e.replace(n,i.configuration)}),document.addEventListener("formengine:flexform:sorting-changed",()=>{d.destroy(),e.replace(n,i.configuration)})})})}}}));
\ No newline at end of file
+var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};define(["require","exports","jquery","TYPO3/CMS/Backend/FormEngine"],(function(e,i,t,a){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.FormEngineInitializer=void 0,t=__importDefault(t);i.FormEngineInitializer=class{static initializeCKEditor(i){e(["ckeditor"],e=>{e.timestamp+="-"+i.configurationHash,i.externalPlugins.forEach(i=>e.plugins.addExternal(i.name,i.resource,"")),(0,t.default)(()=>{const n=i.fieldId,o="#"+t.default.escapeSelector(n);e.replace(n,i.configuration);const d=e.instances[n];d.on("change",e=>{let i=e.sender.commands;d.updateElement(),a.Validation.validateField((0,t.default)(o)),a.Validation.markFieldAsChanged((0,t.default)(o)),void 0!==i.maximize&&1===i.maximize.state&&d.on("maximize",e=>{(0,t.default)(this).off("maximize"),a.Validation.markFieldAsChanged((0,t.default)(o))})}),d.on("mode",e=>{if("source"===e.editor.mode){const e=d.editable();e.attachListener(e,"change",()=>{a.Validation.markFieldAsChanged((0,t.default)(o))})}}),document.addEventListener("inline:sorting-changed",()=>{e.replace(n,i.configuration)}),document.addEventListener("formengine:flexform:sorting-changed",()=>{e.replace(n,i.configuration)})})})}}}));
\ No newline at end of file
--
GitLab