[BUGFIX] Always load scriptaculous in FormEngine 60/37360/2
authorBenjamin Mack <benni@typo3.org>
Sat, 28 Feb 2015 17:01:59 +0000 (18:01 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Sat, 28 Feb 2015 17:06:13 +0000 (18:06 +0100)
As the refactoring of FormEngine now always
includes the suggest JS code,
scriptaculous needs to be loaded all the time
as well for the time being (as long as scriptaculous
is still needed).

Resolves: #65416
Relates: #55575
Releases: master
Change-Id: I276448c7c0dc6745926eb18a0ffae49836c718f2
Reviewed-on: http://review.typo3.org/37360
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Form/FormEngine.php

index a165550..2057944 100644 (file)
@@ -1965,12 +1965,13 @@ class FormEngine {
                                $this->loadJavascriptLib('contrib/placeholdersjs/placeholders.jquery.min.js');
                        }
 
+                       // @todo: remove scriptaclous once suggest is moved to RequireJS, see #55575
+                       $pageRenderer->loadScriptaculous();
                        $this->loadJavascriptLib('sysext/backend/Resources/Public/JavaScript/tceforms.js');
                        $this->loadJavascriptLib('sysext/backend/Resources/Public/JavaScript/jsfunc.tceforms_suggest.js');
 
                        // If IRRE fields were processed, add the JavaScript functions:
                        if ($this->inline->inlineCount) {
-                               $pageRenderer->loadScriptaculous();
                                // We want to load jQuery-ui inside our js. Enable this using requirejs.
                                $pageRenderer->loadRequireJs();
                                $this->loadJavascriptLib('sysext/backend/Resources/Public/JavaScript/jsfunc.inline.js');