! JS vars obviously need to be outputted before all the script files are loaded..........

Signed-off-by: marcusforsberg <info@marcusforsberg.net>

Sources/Subs.php

@@ -3243,7 +3243,22 @@ function template_javascript($do_defered = false)
 
 	// Use this hook to minify/optimize Javascript files and vars
 	call_integration_hook('pre_javascript_output');
+	
+	// Javascript variables.
+	if (!empty($context['javascript_vars']) && !$do_defered)
+	{
+		echo '
+	<script type="text/javascript"><!-- // --><![CDATA[';
+
+		foreach ($context['javascript_vars'] as $key => $value)
+			echo '
+		var ', $key, ' = ', $value, ';';
+
+		echo '
+	// ]]></script>';
+	}
 
+	// Javascript files
 	foreach ($context['javascript_files'] as $id => $file)
 	{
 		if ((!$do_defered && empty($file['options']['defer'])) || ($do_defered && !empty($file['options']['defer'])))
@@ -3258,20 +3273,6 @@ function template_javascript($do_defered = false)
 	// ]]></script>';
 
 	}
-
-	// Javascript variables.
-	if (!empty($context['javascript_vars']) && !$do_defered)
-	{
-		echo '
-	<script type="text/javascript"><!-- // --><![CDATA[';
-
-		foreach ($context['javascript_vars'] as $key => $value)
-			echo '
-		var ', $key, ' = ', $value, ';';
-
-		echo '
-	// ]]></script>';
-	}
 	
 	// Inline JavaScript - Actually useful some times!
 	if (!empty($context['javascript_inline']))