From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 3 Oct 2016 13:16:02 +0000 (+0200)
Subject: Add requirePaths and requireConfig template event
X-Git-Tag: 3.0.0_Beta_2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ae41c12486cfdbb0db74792a252a37a0d8d2892;p=GitHub%2FWoltLab%2FWCF.git

Add requirePaths and requireConfig template event
---

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 913bc45e3b..0ca2538ee5 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -21,7 +21,13 @@
 <script>
 requirejs.config({
 	baseUrl: '{@$__wcf->getPath()}js'
+	{hascontent}
+	, paths: {
+		{content}{event name='requirePaths'}{/content}
+	}
+	{/hascontent}
 });
+{event name='requireConfig'}
 </script>
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/BootstrapFrontend', 'User'], function(Language, BootstrapFrontend, User) {
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 9819a06264..d662b62108 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -32,8 +32,14 @@
 	{js application='wcf' file='wcf.globalHelper' bundle='WoltLabSuite.Core' core='true'}
 	<script>
 		requirejs.config({
-			baseUrl: '{@$__wcf->getPath()}js'
+			baseUrl: '{@$__wcf->getPath()}js',
+			{hascontent}
+			, paths: {
+				{content}{event name='requirePaths'}{/content}
+			}
+			{/hascontent}
 		});
+		{event name='requireConfig'}
 	</script>
 	<script>
 		require(['Language', 'WoltLabSuite/Core/Acp/Bootstrap', 'User'], function(Language, AcpBootstrap, User) {
@@ -163,4 +169,4 @@
 			<section id="main" class="main" role="main">
 				<div class="layoutBoundary">
 					<div id="content" class="content">
-					
\ No newline at end of file
+