From 47429db8a65f0f027599f5088e7d54bedf9a9e15 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 10 Oct 2017 11:11:26 -0400
Subject: [PATCH] Restoring 788399c86da8aab33a391baaa58333f8798ce537,
 nodebb/nodebb#5733, for develop branch

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

diff --git a/templates/footer.tpl b/templates/footer.tpl
index 9e935fb..48d84c8 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,10 +1,6 @@
 		</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>
@@ -20,8 +16,20 @@
 		</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>
-		require(['forum/footer']);
+		window.addEventListener('load', function () {
+			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 f650642..a8f805e 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -16,12 +16,6 @@
 		};
 	</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 -->