From 5eb60bd1101306a853185c44c5f81059f2da9b9d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 10 Oct 2017 11:10:19 -0400
Subject: [PATCH] Revert "moving minfile and custom scripts to the footer,
 nodebb/nodebb#5733"

This reverts commit 788399c86da8aab33a391baaa58333f8798ce537.
---
 templates/footer.tpl | 18 +++++-------------
 templates/header.tpl |  6 ++++++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/templates/footer.tpl b/templates/footer.tpl
index 48d84c8..9e935fb 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,6 +1,10 @@
 		</div><!-- END container -->
 	</main>
 
+	<div class="hide">
+	<!-- IMPORT 500-embed.tpl -->
+	</div>
+
 	<div class="topic-search hidden">
 		<div class="btn-group">
 			<button type="button" class="btn btn-default count"></button>
@@ -16,20 +20,8 @@
 		</div>
 	</div>
 
-	<script async src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
-
-	<!-- BEGIN scripts -->
-	<script async defer type="text/javascript" src="{scripts.src}"></script>
-	<!-- END scripts -->
-
 	<script>
-		window.addEventListener('load', function () {
-			require(['forum/footer']);
-		});
+		require(['forum/footer']);
 	</script>
-
-	<div class="hide">
-	<!-- IMPORT 500-embed.tpl -->
-	</div>
 </body>
 </html>
diff --git a/templates/header.tpl b/templates/header.tpl
index a8f805e..f650642 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -16,6 +16,12 @@
 		};
 	</script>
 
+	<script src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
+
+	<!-- BEGIN scripts -->
+	<script type="text/javascript" src="{scripts.src}"></script>
+	<!-- END scripts -->
+
 	<!-- IF useCustomJS -->
 	{{customJS}}
 	<!-- ENDIF useCustomJS -->