meh... I thought the $id would group the files into some kind of category...

apparently it does not...

Signed-off-by: Suki <[email protected]>

Sources/Admin.php

@@ -29,7 +29,7 @@ function AdminMain()
 	// Load the language and templates....
 	loadLanguage('Admin');
 	loadTemplate('Admin', 'admin');
-	loadJavascriptFile('admin.js', array('default_theme' => true), 'admin.js');
+	loadJavascriptFile('admin.js', array('default_theme' => true), 'smf_admin');
 
 	// No indexing evil stuff.
 	$context['robot_no_index'] = true;

Sources/BoardIndex.php

@@ -131,7 +131,7 @@ function BoardIndex()
 	// Allow mods to add additional buttons here
 	call_integration_hook('integrate_mark_read_button');
 
-	loadJavascriptFile('fader.js', array('default_theme' => true, 'defer' => true), 'smf_scripts');
+	loadJavascriptFile('fader.js', array('default_theme' => true, 'defer' => false), 'smf_fader');
 }
 
 /**

Sources/Load.php

@@ -1853,7 +1853,7 @@ function loadTheme($id_theme = 0, $initialize = true)
 	loadJavascriptFile('smf_jquery_plugins.js', array('default_theme' => true));
 
 	// script.js and theme.js, always required, so always add them! Makes index.template.php cleaner and all.
-	loadJavascriptFile('script.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('script.js', array('default_theme' => true, 'defer' => false), 'smf_scripts');
 	loadJavascriptFile('theme.js', array(), 'theme_scripts');
 
 	// If we think we have mail to send, let's offer up some possibilities... robots get pain (Now with scheduled task support!)

Sources/LogInOut.php

@@ -70,7 +70,7 @@ function Login()
 		unset($_SESSION['login_url']);
 
 	// Need some js goodies.
-	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 
 	// Create a one time token.
 	createToken('login');

Sources/Register.php

@@ -708,7 +708,7 @@ function Activate()
 		'description' => $txt['activate_success']
 	);
 
-	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 }
 
 /**

Sources/Reminder.php

@@ -271,7 +271,7 @@ function setPassword2()
 		'description' => $txt['reminder_password_set']
 	);
 
-	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 	createToken('login');
 }
 

Sources/Security.php

@@ -155,7 +155,7 @@ function is_not_guest($message = '')
 	else
 	{
 		loadTemplate('Login');
-		loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+		loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 		$context['sub_template'] = 'kick_guest';
 		$context['robot_no_index'] = true;
 	}

Sources/Subs-Auth.php

@@ -159,7 +159,7 @@ function KickGuest()
 	createToken('login');
 
 	// Need some js goodies.
-	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 
 	// Never redirect to an attachment
 	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false)
@@ -181,7 +181,7 @@ function InMaintenance()
 	loadLanguage('Login');
 	loadTemplate('Login');
 	createToken('login');
-	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 
 	// Send a 503 header, so search engines don't bother indexing while we're in maintenance mode.
 	header('HTTP/1.1 503 Service Temporarily Unavailable');
@@ -207,7 +207,7 @@ function adminLogin($type = 'admin')
 
 	loadLanguage('Admin');
 	loadTemplate('Login');
-	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_sha1');
 
 	// Validate what type of session check this is.
 	$types = array();