[FOLLOWUP][TASK] Remove old jquery versions from the Core 29/41029/3
authorMarkus Klein <markus.klein@typo3.org>
Thu, 9 Jul 2015 10:52:50 +0000 (12:52 +0200)
committerBenjamin Mack <benni@typo3.org>
Thu, 9 Jul 2015 11:12:22 +0000 (13:12 +0200)
Fix functional tests and some other forgotten places.

Resolves: #67997
Releases: master
Change-Id: Icbdcbf8ac19a02483badfd7d748384e06d008049
Reviewed-on: http://review.typo3.org/41029
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
typo3/sysext/core/Classes/Page/PageRenderer.php
typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
typo3/sysext/install/Resources/Private/Layouts/Step.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html

index 691526f..3de0899 100644 (file)
@@ -1594,7 +1594,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
                        // first, load all paths for the namespaces, and configure contrib libs.
                        $this->requireJsConfig['paths'] = array(
                                'jquery-ui' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/jquery-ui',
-                               'jquery' => $this->backPath . 'contrib/jquery',
+                               'jquery' => $this->backPath . rtrim($this->jQueryPath, '/'),
                                'datatables' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/jquery.dataTables',
                                'nprogress' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/nprogress',
                                'moment' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/moment',
index 92c6910..305ca0a 100644 (file)
@@ -88,7 +88,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $expectedScriptaculousSlider  = '<script src="sysext/core/Resources/Public/JavaScript/Contrib/scriptaculous/slider.js" type="text/javascript"></script>';
 
                $subject->loadJquery();
-               $expectedJqueryRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+               $expectedJqueryRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
                $expectedJqueryStatement = 'var TYPO3 = TYPO3 || {}; TYPO3.jQuery = jQuery.noConflict(true);';
 
                $subject->loadExtJS(TRUE, TRUE, 'jquery');
@@ -243,7 +243,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function loadJqueryRespectsGivenNamespace() {
                $subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-               $expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+               $expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
                $expectedStatement = 'var TYPO3 = TYPO3 || {}; TYPO3.MyNameSpace = jQuery.noConflict(true);';
                $subject->loadJquery(NULL, NULL, 'MyNameSpace');
                $out = $subject->render();
@@ -257,7 +257,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function loadJqueryWithDefaultNoConflictModeDoesNotSetNamespace() {
                $subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-               $expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+               $expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
                $expectedStatement = 'jQuery.noConflict();';
                $subject->loadJquery(NULL, NULL, \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT);
                $out = $subject->render();
@@ -272,7 +272,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function loadJqueryWithNamespaceNoneDoesNotIncludeNoConflictHandling() {
                $subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-               $expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+               $expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
                $subject->loadJquery(NULL, NULL, \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_NAMESPACE_NONE);
                $out = $subject->render();
                $this->assertRegExp($expectedRegExp, $out);
@@ -285,7 +285,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function loadJqueryLoadsTheLatestJqueryVersionInNoConflictModeUncompressedInDebugMode() {
                $subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-               $expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+               $expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
                $expectedStatement = 'var TYPO3 = TYPO3 || {}; TYPO3.jQuery = jQuery.noConflict(true);';
                $subject->loadJquery();
                $subject->enableDebugMode();
index f50d79c..47c557e 100644 (file)
@@ -1,10 +1,8 @@
-{namespace i=TYPO3\CMS\Install\ViewHelpers}
-
 <!DOCTYPE html>
-<html>
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers">
        <head>
                <title>Installing TYPO3 CMS</title>
-               <script type="text/javascript" src="../../../contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
+               <script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
                <script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>
                <link rel="stylesheet" type="text/css" href="../Resources/Public/Stylesheets/Action/Step/General.css?{time}" />
        </head>
index 746b804..c378b2f 100644 (file)
@@ -2,5 +2,5 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <link rel="shortcut icon" href="../../../gfx/favicon.ico" />
 <link rel="stylesheet" type="text/css" href="../Resources/Public/Stylesheets/Action/Common/Install.css?{time}" />
-<script type="text/javascript" src="../../../contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
-<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
+<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>