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

7 years ago · b03dd5d98e
parent 1f2e432612
commit b03dd5d98e
2 changed files with 11 additions and 14 deletions
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@ -17,21 +17,8 @@
 	</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>
-		window.addEventListener('load', function () {
-			require(['forum/footer']);
-
-			<!-- IF useCustomJS -->
-			{{customJS}}
-			<!-- ENDIF useCustomJS -->
-		});
+		require(['forum/footer']);
 	</script>

 	<div class="hide">
--- a/templates/header.tpl
+++ b/templates/header.tpl
@ -22,6 +22,16 @@
 	<!-- 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}">