App/Themes: Move extera js after set CONFIG

FusionWowCMS · Oct 24, 2024 · 3918d29 · 3918d29
1 parent 71dc94e
commit 3918d29
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 47 deletions.
diff --git a/application/themes/default/views/header.tpl b/application/themes/default/views/header.tpl
@@ -68,18 +68,6 @@
 		{minify type="js" files=$assets.js.parts.all.files output="{$assets.js.path}{$assets.js.parts.all.name}?v={$theme_configs.config.version}" disable="{$minify_js}"}
 		{foreach from=$assets.js.parts.module.files item=file}<script type="text/javascript" src="{if $cdn_link != false}{str_replace(base_url(), $cdn_link, $file)}{else}{$file}{/if}?v={$theme_configs.config.version}"></script>{/foreach}
 
-		{if $extra_js}
-			{if !is_array($extra_js)}
-				<script type="text/javascript" src="{$path}{$extra_js}?v={$theme_configs.config.version}"></script>
-			{else}
-				{strip}
-					{foreach from=$extra_js item=js}
-						<script type="text/javascript" src="{$path}{$js}?v={$theme_configs.config.version}"></script>
-					{/foreach}
-				{/strip}
-			{/if}
-		{/if}
-
 		<!--[if lt IE 9]>
 			<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
 			<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
@@ -116,6 +104,18 @@
 			UI.initialize();
 		</script>
 
+		{if $extra_js}
+			{if !is_array($extra_js)}
+				<script type="text/javascript" src="{$path}{$extra_js}?v={$theme_configs.config.version}"></script>
+			{else}
+			{strip}
+			{foreach from=$extra_js item=js}
+				<script type="text/javascript" src="{$path}{$js}?v={$theme_configs.config.version}"></script>
+			{/foreach}
+			{/strip}
+			{/if}
+		{/if}
+
 		{if $analytics}
 			<!-- Google tag (gtag.js) -->
 			<script async src="https://www.googletagmanager.com/gtag/js?id={$analytics}"></script>

diff --git a/application/themes/frostbret/views/header.tpl b/application/themes/frostbret/views/header.tpl
@@ -61,17 +61,6 @@
 
 		<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/dt-1.11.5/datatables.min.js"></script>
 
-		{if $extra_js}
-			{if !is_array($extra_js)}
-				<script type="text/javascript" src="{$path}{$extra_js}"></script>
-			{else}
-				{strip}
-					{foreach from=$extra_js item=js}
-						<script type="text/javascript" src="{$path}{$js}"></script>
-					{/foreach}
-				{/strip}
-			{/if}
-		{/if}
 
 		<!-- Header JS.End -->
 
@@ -115,4 +104,15 @@
 				})();
 			{/if}
 		</script>
+		{if $extra_js}
+			{if !is_array($extra_js)}
+				<script type="text/javascript" src="{$path}{$extra_js}"></script>
+			{else}
+			    {strip}
+			        {foreach from=$extra_js item=js}
+			            <script type="text/javascript" src="{$path}{$js}"></script>
+			        {/foreach}
+			    {/strip}
+			{/if}
+		{/if}
 	</head>
diff --git a/application/themes/heaven/views/header.tpl b/application/themes/heaven/views/header.tpl
@@ -68,18 +68,6 @@
 		{minify type="js" files=$assets.js.parts.all.files output="{$assets.js.path}{$assets.js.parts.all.name}?v={$theme_configs.config.version}" disable="{$minify_js}"}
 		{foreach from=$assets.js.parts.module.files item=file}<script type="text/javascript" src="{if $cdn_link != false}{str_replace(base_url(), $cdn_link, $file)}{else}{$file}{/if}?v={$theme_configs.config.version}"></script>{/foreach}
 
-		{if $extra_js}
-			{if !is_array($extra_js)}
-				<script type="text/javascript" src="{$path}{$extra_js}?v={$theme_configs.config.version}"></script>
-			{else}
-				{strip}
-					{foreach from=$extra_js item=js}
-						<script type="text/javascript" src="{$path}{$js}?v={$theme_configs.config.version}"></script>
-					{/foreach}
-				{/strip}
-			{/if}
-		{/if}
-
 		<!--[if lt IE 9]>
 			<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
 			<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
@@ -116,6 +104,18 @@
 			UI.initialize();
 		</script>
 
+		{if $extra_js}
+			{if !is_array($extra_js)}
+				<script type="text/javascript" src="{$path}{$extra_js}?v={$theme_configs.config.version}"></script>
+			{else}
+			    {strip}
+			        {foreach from=$extra_js item=js}
+			        	<script type="text/javascript" src="{$path}{$js}?v={$theme_configs.config.version}"></script>
+			        {/foreach}
+			    {/strip}
+			{/if}
+		{/if}
+
 		{if $analytics}
 			<!-- Google tag (gtag.js) -->
 			<script async src="https://www.googletagmanager.com/gtag/js?id={$analytics}"></script>

diff --git a/application/views/header.tpl b/application/views/header.tpl
@@ -54,18 +54,6 @@
 
 		<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/dt-1.11.5/datatables.min.js"></script>
 
-		{if $extra_js}
-			{if !is_array($extra_js)}
-				<script type="text/javascript" src="{$path}{$extra_js}"></script>
-			{else}
-				{strip}
-					{foreach from=$extra_js item=js}
-						<script type="text/javascript" src="{$path}{$js}"></script>
-					{/foreach}
-				{/strip}
-			{/if}
-		{/if}
-
 		<!-- Header JS.End -->
 
 		<!--[if lt IE 9]>
@@ -104,6 +92,18 @@
 			UI.initialize();
 		</script>
 
+		{if $extra_js}
+			{if !is_array($extra_js)}
+				<script type="text/javascript" src="{$path}{$extra_js}"></script>
+			{else}
+			    {strip}
+			        {foreach from=$extra_js item=js}
+			        	<script type="text/javascript" src="{$path}{$js}"></script>
+			        {/foreach}
+			    {/strip}
+			{/if}
+		{/if}
+
 		{if $analytics}
 		<script type="text/javascript">
 		// Google Analytics