closes #4978

public/src/require-config.js

@@ -0,0 +1,11 @@
+require.config({
+	baseUrl: config.relative_path + "/src/modules",
+	waitSeconds: 7,
+	urlArgs: "v=" + config['cache-buster'],
+	paths: {
+		'forum': '../client',
+		'admin': '../admin',
+		'vendor': '../../vendor',
+		'plugins': '../../plugins'
+	}
+});

src/meta/js.js

@@ -26,6 +26,7 @@ module.exports = function(Meta) {
 				'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js',
 				'public/vendor/jquery/textcomplete/jquery.textcomplete.js',
 				'public/vendor/requirejs/require.js',
+				'public/src/require-config.js',
 				'public/vendor/bootbox/bootbox.min.js',
 				'public/vendor/tinycon/tinycon.js',
 				'public/vendor/xregexp/xregexp.js',

src/views/admin/header.tpl

@@ -16,7 +16,8 @@
 			template: "{template.name}",
 			user: JSON.parse('{{userJSON}}'),
 			config: JSON.parse(decodeURIComponent("{{adminConfigJSON}}")),
-			flags: {}
+			flags: {},
+			inAdmin: true
 		};
 	</script>
 
@@ -30,20 +31,6 @@
 		<script src="https://storage.googleapis.com/code.getmdl.io/1.0.3/material.min.js"></script>
 		<script type="text/javascript" src="{relative_path}/vendor/jquery/sortable/Sortable.js?{cache-buster}"></script>
 		<script type="text/javascript" src="{relative_path}/acp.min.js?{cache-buster}"></script>
-		<script>
-			require.config({
-				baseUrl: "{relative_path}/src/modules",
-				waitSeconds: 3,
-				urlArgs: "{cache-buster}",
-				paths: {
-					'forum': '../client',
-					'admin': '../admin',
-					'vendor': '../../vendor'
-				}
-			});
-
-			app.inAdmin = true;
-		</script>
 		<script type="text/javascript" src="{relative_path}/vendor/colorpicker/colorpicker.js?{cache-buster}"></script>
 		<script type="text/javascript" src="{relative_path}/src/admin/admin.js?{cache-buster}"></script>
 		<script type="text/javascript" src="{relative_path}/vendor/ace/ace.js?{cache-buster}"></script>

src/views/partials/requirejs-config.tpl

@@ -1,13 +0,0 @@
-<script>
-	require.config({
-		baseUrl: "{relative_path}/src/modules",
-		waitSeconds: 3,
-		urlArgs: "v={config.cache-buster}",
-		paths: {
-			'forum': '../client',
-			'admin': '../admin',
-			'vendor': '../../vendor',
-			'plugins': '../../plugins'
-		}
-	});
-</script>