Revert "moved js back to header for interpolation, nodebb/nodebb#6664"

This reverts commit b03dd5d98e.
7 years ago · a9b575e11b
parent cb29031c1a
commit a9b575e11b
2 changed files with 14 additions and 11 deletions
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@ -17,8 +17,21 @@
 	</div>
 	<!-- ENDIF !isSpider -->

+
+	<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
+
+	<!-- BEGIN scripts -->
+	<script defer type="text/javascript" src="{scripts.src}"></script>
+	<!-- END scripts -->
+
 	<script>
-		require(['forum/footer']);
+		window.addEventListener('load', function () {
+			require(['forum/footer']);
+
+			<!-- IF useCustomJS -->
+			{{customJS}}
+			<!-- ENDIF useCustomJS -->
+		});
 	</script>

 	<div class="hide">
--- a/templates/header.tpl
+++ b/templates/header.tpl
@ -22,16 +22,6 @@
 	<!-- IF useCustomCSS -->
 	<style>{{customCSS}}</style>
 	<!-- END -->
-
-	<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 -->
-	<script>
-	{{customJS}}
-	</script>
-	<!-- ENDIF useCustomJS -->
 </head>

 <body class="{bodyClass} skin-{config.bootswatchSkin}">