From 24e3c655c7aecadc287fc924c9fdcca46b7b7ece Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@typo3.org>
Date: Mon, 27 Mar 2017 14:35:02 +0100
Subject: [PATCH] Revert "[BUGFIX] JS: Add missing dependency on
FormEngineValidation"
This reverts commit b07bb2e9fb011a999a01ffb5ab323691f866179d.
The patch is replaced by a better solution.
Revert is only done for master, backport was
not done yet.
Change-Id: Ibcabb095e0043dd21cd694142d93baea7dc8e8c5
Reverts: #80459
Releases: master
Reviewed-on: https://review.typo3.org/52176
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../backend/Resources/Public/JavaScript/FormEngineFlexForm.js | 3 +--
.../rte_ckeditor/Classes/Form/Element/RichTextElement.php | 2 +-
.../Resources/Public/JavaScript/HTMLArea/Editor/Editor.js | 4 +---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js
index 0c32631e5e08..458b3d1e5166 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js
@@ -22,8 +22,7 @@
*/
define(['jquery',
'TYPO3/CMS/Backend/Modal',
- 'TYPO3/CMS/Backend/FormEngine',
- 'TYPO3/CMS/Backend/FormEngineValidation'
+ 'TYPO3/CMS/Backend/FormEngine'
], function ($, Modal) {
/**
diff --git a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
index a16039e0036b..f485c4160f7e 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
@@ -184,7 +184,7 @@ class RichTextElement extends AbstractFormElement
return 'function(CKEDITOR) {
' . $externalPlugins . '
CKEDITOR.replace("' . $fieldId . '", ' . json_encode($configuration) . ');
- require([\'TYPO3/CMS/Backend/FormEngine\',\'TYPO3/CMS/Backend/FormEngineValidation\'], function(FormEngine) {
+ require([\'TYPO3/CMS/Backend/FormEngine\'], function(FormEngine) {
CKEDITOR.instances.' . $fieldId . '.on(\'change\', function() {
CKEDITOR.instances.' . $fieldId . '.updateElement();
FormEngine.Validation.validate();
diff --git a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Editor.js b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Editor.js
index 205c51129238..b079d8bf62e1 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Editor.js
+++ b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Editor.js
@@ -30,9 +30,7 @@ define(['TYPO3/CMS/Rtehtmlarea/HTMLArea/UserAgent/UserAgent',
'TYPO3/CMS/Rtehtmlarea/HTMLArea/Editor/TextAreaContainer',
'TYPO3/CMS/Rtehtmlarea/HTMLArea/Editor/StatusBar',
'TYPO3/CMS/Backend/FormEngine',
- 'TYPO3/CMS/Backend/Notification',
- 'TYPO3/CMS/Backend/FormEngineValidation'
- ],
+ 'TYPO3/CMS/Backend/Notification'],
function (UserAgent, Util, Ajax, Dom, Event, Selection, BookMark, Node, Typo3, Framework, Toolbar, Iframe, TextAreaContainer, StatusBar, FormEngine, Notification) {
/**
--
GitLab