Skip to content

Commit 258583e

Browse files
committed
[TASK] Use JS module loader instead of requirejs when available
1 parent a167840 commit 258583e

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

Classes/Integration/HookSubscribers/EditDocumentController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ public function requireColumnPositionJavaScript() : void
1616
{
1717
/** @var PageRenderer $pageRenderer */
1818
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
19-
$pageRenderer->loadRequireJsModule('TYPO3/CMS/Flux/FluxColPosAssignment');
19+
if (method_exists($pageRenderer, 'loadJavaScriptModule')) {
20+
$pageRenderer->loadJavaScriptModule('@fluidtypo3/flux/FluxColPosAssignment.js');
21+
} else {
22+
$pageRenderer->loadRequireJsModule('TYPO3/CMS/Flux/FluxColPosAssignment');
23+
}
2024
}
2125
}

Classes/Integration/PreviewRenderer.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ protected function attachAssets(): void
5656
{
5757
if (!static::$assetsIncluded) {
5858
$this->pageRenderer->addCssFile('EXT:flux/Resources/Public/css/flux.css');
59-
$this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Flux/FluxCollapse');
59+
if (method_exists($this->pageRenderer, 'loadJavaScriptModule')) {
60+
$this->pageRenderer->loadJavaScriptModule('@fluidtypo3/flux/FluxCollapse.js');
61+
} else {
62+
$this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Flux/FluxCollapse');
63+
}
6064

6165
static::$assetsIncluded = true;
6266
}

Configuration/JavaScriptModules.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
3+
return [
4+
'dependencies' => ['core', 'backend'],
5+
'imports' => [
6+
'@fluidtypo3/flux' => 'EXT:flux/Resources/Public/JavaScript/',
7+
]
8+
];

0 commit comments

Comments
 (0)