Skip to content
Snippets Groups Projects
Commit 7cda0782 authored by Benjamin Franzke's avatar Benjamin Franzke Committed by Christian Kuhn
Browse files

[TASK] Initialize Install Tool layout without inline JavaScript 

Pass startup module and bust parameter as data tags
to avoid inline javascript initialization.

Resolves: #94136
Releases: master
Change-Id: If4a79b338d121f0a01d15adadf5b86501f4dac52
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69142


Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 023864e3
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
+ 1
− 7
View file @ 7cda0782
......@@ -6,14 +6,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
<link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
<script>
var __bust = '{bust}';
</script>
<script src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}"></script>
<script src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}" data-bust="{bust}" data-init="TYPO3/CMS/Install/Installer"></script>
<script src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
<script>
require(['TYPO3/CMS/Install/Installer']);
</script>
</head>
<body class="backend t3js-body install-tool-installer typo3-install"></body>
</html>
typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
+ 1
− 8
View file @ 7cda0782
......@@ -6,15 +6,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
<link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
<script>
var TYPO3 = TYPO3 || {};
var __bust = '{bust}';
</script>
<script src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}"></script>
<script src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}" data-bust="{bust}" data-init="TYPO3/CMS/Install/Install"></script>
<script src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
<script>
require(['TYPO3/CMS/Install/Install']);
</script>
</head>
<body class="backend install-tool-init t3js-body scaffold t3js-scaffold scaffold-modulemenu-expanded" data-controller="{controller}" data-context="{context}">
<div>
......
typo3/sysext/install/Resources/Public/JavaScript/RequireJSConfig.js
+ 7
− 1
View file @ 7cda0782
var TYPO3 = TYPO3 || {};
var require = {
baseUrl: '',
urlArgs: 'bust=' + (typeof __bust !== 'undefined' ? __bust : (new Date()).getTime()),
urlArgs: 'bust=' + (typeof document.currentScript.dataset.bust !== undefined ? document.currentScript.dataset.bust : (new Date()).getTime()),
paths: {
'TYPO3/CMS/Core': 'sysext/core/Resources/Public/JavaScript',
'TYPO3/CMS/Backend': 'sysext/backend/Resources/Public/JavaScript',
......@@ -42,3 +44,7 @@ var require = {
}
}
};
if (typeof document.currentScript.dataset.init !== undefined) {
require.deps = [document.currentScript.dataset.init];
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment