From b07bb2e9fb011a999a01ffb5ab323691f866179d Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@typo3.org>
Date: Sun, 26 Mar 2017 19:54:42 +0200
Subject: [PATCH] [BUGFIX] JS: Add missing dependency on FormEngineValidation
The code must not use the nested FormEngine.Validation module
without specifying a dependency on this module as well.
Releases: master, 7.6
Resolves: #80459
Change-Id: Iaea325a679ac8bae116b33b912e3e9e2f7cd9163
Reviewed-on: https://review.typo3.org/52168
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Thomas Hohn <thomas@hohn.dk>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Kay Strobach <typo3@kay-strobach.de>
Tested-by: Kay Strobach <typo3@kay-strobach.de>
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
---
.../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, 6 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js
index 458b3d1e5166..0c32631e5e08 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineFlexForm.js
@@ -22,7 +22,8 @@
*/
define(['jquery',
'TYPO3/CMS/Backend/Modal',
- 'TYPO3/CMS/Backend/FormEngine'
+ 'TYPO3/CMS/Backend/FormEngine',
+ 'TYPO3/CMS/Backend/FormEngineValidation'
], 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 f485c4160f7e..a16039e0036b 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\'], function(FormEngine) {
+ require([\'TYPO3/CMS/Backend/FormEngine\',\'TYPO3/CMS/Backend/FormEngineValidation\'], 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 b079d8bf62e1..205c51129238 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Editor.js
+++ b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Editor.js
@@ -30,7 +30,9 @@ 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/Notification',
+ 'TYPO3/CMS/Backend/FormEngineValidation'
+ ],
function (UserAgent, Util, Ajax, Dom, Event, Selection, BookMark, Node, Typo3, Framework, Toolbar, Iframe, TextAreaContainer, StatusBar, FormEngine, Notification) {
/**
--
GitLab