From e9f2bfae9fa210622791f0600bf420ec01b29cac Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Mon, 15 Feb 2016 18:35:21 +0100
Subject: [PATCH] [BUGFIX] Initialize T3editor properly
If a T3editor is instantiated on-the-fly, it is not initialized properly.
Add a callback to the ``Form/Element/T3editorElement`` class and mark
editor instances as initialized to prevent double initialization.
Change-Id: I8c6b692eb2c132180ed0d122b35515276df5acd9
Resolves: #73425
Releases: master, 7.6
Reviewed-on: https://review.typo3.org/46680
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
---
.../sysext/t3editor/Classes/Form/Element/T3editorElement.php | 2 +-
typo3/sysext/t3editor/Resources/Public/JavaScript/T3editor.js | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
index a460f05176bd..cb02e03fbb3c 100644
--- a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
+++ b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
@@ -123,6 +123,7 @@ class T3editorElement extends AbstractFormElement
$this->data['tableName'] . ' > ' . $this->data['fieldName'],
array('target' => 0)
);
+ $this->resultArray['additionalJavaScriptPost'][] = 'require(["TYPO3/CMS/T3editor/T3editor"], function(T3editor) {T3editor.findAndInitializeEditors();});';
$this->initJavascriptCode();
return $this->resultArray;
@@ -158,7 +159,6 @@ class T3editorElement extends AbstractFormElement
protected function initJavascriptCode()
{
$this->resultArray['stylesheetFiles'][] = $this->relExtPath . 'Resources/Public/Css/t3editor.css';
- $this->resultArray['requireJsModules'][] = 'TYPO3/CMS/T3editor/T3editor';
if ($this->mode === self::MODE_TYPOSCRIPT) {
foreach ($this->codeCompletionComponents as $codeCompletionComponent) {
$this->resultArray['requireJsModules'][] = 'TYPO3/CMS/T3editor/Plugins/CodeCompletion/' . $codeCompletionComponent;
diff --git a/typo3/sysext/t3editor/Resources/Public/JavaScript/T3editor.js b/typo3/sysext/t3editor/Resources/Public/JavaScript/T3editor.js
index 7fe92bff54c5..6a994b54e2de 100644
--- a/typo3/sysext/t3editor/Resources/Public/JavaScript/T3editor.js
+++ b/typo3/sysext/t3editor/Resources/Public/JavaScript/T3editor.js
@@ -45,6 +45,9 @@ define(['jquery',
* @param {Number} index
*/
T3editor.initializeEditor = function($editor, index) {
+ if ($editor.data('initialized')) {
+ return;
+ }
var $textarea = $editor.find('textarea'),
options = {
labels: $textarea.data('labels'),
@@ -76,6 +79,7 @@ define(['jquery',
$textarea.hide();
}
});
+ $editor.data('initialized', true);
};
/**
--
GitLab