From 77152fe658e2bb5ad41e6db194d1f1db1fac88c7 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Sat, 9 Sep 2017 19:32:38 +0200
Subject: [PATCH] [FOLLOWUP][TASK] Remove TYPO3.jQuery
This followup ensures that the Frontend Request including jQuery behaves
the same as the TYPO3 Backend (noConflict is default).
Related: #79221
Resolves: #82378
Releases: master
Change-Id: Ic16fcfb6932cc32d4190e715708c58f234dde5d7
Reviewed-on: https://review.typo3.org/54074
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
typo3/sysext/frontend/Classes/Page/PageGenerator.php | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index 9cbf920dfa34..6eef4421670c 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -372,12 +372,7 @@ class PageGenerator
$source = isset($jQueryTS['source']) ? $jQueryTS['source'] : null;
// When "noConflict" is not set or "1" enable the default jQuery noConflict mode, otherwise disable the namespace
if (!isset($jQueryTS['noConflict']) || !empty($jQueryTS['noConflict'])) {
- // Set namespace to the "noConflict.namespace" value if "noConflict.namespace" has a value
- if (!empty($jQueryTS['noConflict.']['namespace'])) {
- $namespace = $jQueryTS['noConflict.']['namespace'];
- } else {
- $namespace = PageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT;
- }
+ $namespace = 'noConflict';
} else {
$namespace = PageRenderer::JQUERY_NAMESPACE_NONE;
}
--
GitLab