Use camelCase on JavaScript generic functions

Signed-off-by: Jessica González <[email protected]>
imanbarati · Oct 22, 2016 · d7eb9cf · d7eb9cf
1 parent de0fa82
commit d7eb9cf
Show file tree

Hide file tree

Showing 33 changed files with 89 additions and 89 deletions.
diff --git a/Sources/Admin.php b/Sources/Admin.php
@@ -30,7 +30,7 @@ function AdminMain()
 	// Load the language and templates....
 	loadLanguage('Admin');
 	loadTemplate('Admin');
-	loadJavascriptFile('admin.js', array(), 'smf_admin');
+	loadJavaScriptFile('admin.js', array(), 'smf_admin');
 	loadCSSFile('admin.css', array(), 'smf_admin');
 
 	// No indexing evil stuff.
@@ -572,7 +572,7 @@ function AdminHome()
 	);
 
 	if ($context['admin_area'] == 'admin')
-		loadJavascriptFile('admin.js', array('defer' => false), 'smf_admin');
+		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
 }
 
 /**

diff --git a/Sources/BoardIndex.php b/Sources/BoardIndex.php
@@ -138,7 +138,7 @@ function BoardIndex()
 
 	if (!empty($settings['show_newsfader']))
 	{
-		loadJavascriptFile('slippry.min.js', array(), 'smf_jquery_slippry');
+		loadJavaScriptFile('slippry.min.js', array(), 'smf_jquery_slippry');
 		loadCSSFile('slider.min.css', array(), 'smf_jquery_slider');
 	}
 }

diff --git a/Sources/Display.php b/Sources/Display.php
@@ -1299,24 +1299,24 @@ function Display()
 
 	// Load the drafts js file
 	if ($context['drafts_autosave'])
-		loadJavascriptFile('drafts.js', array('defer' => false), 'smf_drafts');
+		loadJavaScriptFile('drafts.js', array('defer' => false), 'smf_drafts');
 
 	// Spellcheck
 	if ($context['show_spellchecking'])
-		loadJavascriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+		loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
 
 	// topic.js
-	loadJavascriptFile('topic.js', array('defer' => false), 'smf_topic');
+	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
 
 	// quotedText.js
-	loadJavascriptFile('quotedText.js', array('defer' => true), 'smf_quotedText');
+	loadJavaScriptFile('quotedText.js', array('defer' => true), 'smf_quotedText');
 
 	// Mentions
 	if (!empty($modSettings['enable_mentions']) && allowedTo('mention'))
 	{
-		loadJavascriptFile('jquery.atwho.min.js', array('defer' => true), 'smf_atwho');
-		loadJavascriptFile('jquery.caret.min.js', array('defer' => true), 'smf_caret');
-		loadJavascriptFile('mentions.js', array('defer' => true), 'smf_mentions');
+		loadJavaScriptFile('jquery.atwho.min.js', array('defer' => true), 'smf_atwho');
+		loadJavaScriptFile('jquery.caret.min.js', array('defer' => true), 'smf_caret');
+		loadJavaScriptFile('mentions.js', array('defer' => true), 'smf_mentions');
 	}
 }
 

diff --git a/Sources/Groups.php b/Sources/Groups.php
@@ -438,7 +438,7 @@ function MembergroupMembers()
 	createToken('mod-mgm');
 
 	if ($context['group']['assignable'])
-		loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 }
 
 /**

diff --git a/Sources/Load.php b/Sources/Load.php
@@ -2116,29 +2116,29 @@ function loadTheme($id_theme = 0, $initialize = true)
 
 	// Add the JQuery library to the list of files to load.
 	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn')
-		loadJavascriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
+		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
 
 	elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local')
-		loadJavascriptFile('jquery-2.1.4.min.js', array('seed' => false), 'smf_jquery');
+		loadJavaScriptFile('jquery-2.1.4.min.js', array('seed' => false), 'smf_jquery');
 
 	elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom')
-		loadJavascriptFile($modSettings['jquery_custom'], array(), 'smf_jquery');
+		loadJavaScriptFile($modSettings['jquery_custom'], array(), 'smf_jquery');
 
 	// Auto loading? template_javascript() will take care of the local half of this.
 	else
-		loadJavascriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
+		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
 
 	// Queue our JQuery plugins!
-	loadJavascriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
+	loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
 	if (!$user_info['is_guest'])
 	{
-		loadJavascriptFile('jquery.custom-scrollbar.js', array(), 'smf_jquery_scrollbar');
+		loadJavaScriptFile('jquery.custom-scrollbar.js', array(), 'smf_jquery_scrollbar');
 		loadCSSFile('jquery.custom-scrollbar.css', array('force_current' => false, 'validate' => true), 'smf_scrollbar');
 	}
 
 	// script.js and theme.js, always required, so always add them! Makes index.template.php cleaner and all.
-	loadJavascriptFile('script.js', array('defer' => false, 'minimize' => true), 'smf_script');
-	loadJavascriptFile('theme.js', array('minimize' => true), 'smf_theme');
+	loadJavaScriptFile('script.js', array('defer' => false, 'minimize' => true), 'smf_script');
+	loadJavaScriptFile('theme.js', array('minimize' => true), 'smf_theme');
 
 	// If we think we have mail to send, let's offer up some possibilities... robots get pain (Now with scheduled task support!)
 	if ((!empty($modSettings['mail_next_send']) && $modSettings['mail_next_send'] < time() && empty($modSettings['mail_queue_use_cron'])) || empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
@@ -2159,7 +2159,7 @@ function loadTheme($id_theme = 0, $initialize = true)
 			$type = empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time() ? 'task' : 'mailq';
 			$ts = $type == 'mailq' ? $modSettings['mail_next_send'] : $modSettings['next_task_time'];
 
-			addInlineJavascript('
+			addInlineJavaScript('
 		function smfAutoTask()
 		{
 			$.get(smf_scripturl + "?scheduled=' . $type . ';ts=' . $ts . '");
@@ -2442,7 +2442,7 @@ function addInlineCss($css)
  *
  * @param string $id An ID to stick on the end of the filename
  */
-function loadJavascriptFile($fileName, $params = array(), $id = '')
+function loadJavaScriptFile($fileName, $params = array(), $id = '')
 {
 	global $settings, $context, $modSettings;
 
@@ -2508,7 +2508,7 @@ function loadJavascriptFile($fileName, $params = array(), $id = '')
  * @param string $value The value
  * @param bool $escape Whether or not to escape the value
  */
-function addJavascriptVar($key, $value, $escape = false)
+function addJavaScriptVar($key, $value, $escape = false)
 {
 	global $context;
 
@@ -2527,7 +2527,7 @@ function addJavascriptVar($key, $value, $escape = false)
  * @param bool $defer Whether the script should load in <head> or before the closing <html> tag
  * @return void|bool Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
  */
-function addInlineJavascript($javascript, $defer = false)
+function addInlineJavaScript($javascript, $defer = false)
 {
 	global $context;
 

diff --git a/Sources/ManageBans.php b/Sources/ManageBans.php
@@ -579,7 +579,7 @@ function BanEdit()
 		}
 	}
 
-	loadJavascriptFile('suggest.js', array(), 'smf_suggest');
+	loadJavaScriptFile('suggest.js', array(), 'smf_suggest');
 	$context['sub_template'] = 'ban_edit';
 
 }
@@ -1601,7 +1601,7 @@ function BanEditTrigger()
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
 	}
 
-	loadJavascriptFile('suggest.js', array(), 'smf_suggest');
+	loadJavaScriptFile('suggest.js', array(), 'smf_suggest');
 
 	if (empty($ban_id))
 	{

diff --git a/Sources/ManageBoards.php b/Sources/ManageBoards.php
@@ -595,7 +595,7 @@ function EditBoard()
 	{
 		$context['sub_template'] = 'modify_board';
 		$context['page_title'] = $txt['boardsEdit'];
-		loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 	}
 	else
 	{
@@ -874,7 +874,7 @@ function EditBoardSettings($return_config = false)
 	$context['sub_template'] = 'show_settings';
 
 	// Add some javascript stuff for the recycle box.
-	addInlineJavascript('
+	addInlineJavaScript('
 	document.getElementById("recycle_board").disabled = !document.getElementById("recycle_enable").checked;', true);
 
 	// Warn the admin against selecting the recycle topic without selecting a board.

diff --git a/Sources/ManageLanguages.php b/Sources/ManageLanguages.php
@@ -670,7 +670,7 @@ function ModifyLanguages()
 	);
 
 	// We want to highlight the selected language. Need some Javascript for this.
-	addInlineJavascript('
+	addInlineJavaScript('
 	function highlightSelected(box)
 	{
 		$("tr.highlight2").removeClass("highlight2");

diff --git a/Sources/ManageMaintenance.php b/Sources/ManageMaintenance.php
@@ -198,7 +198,7 @@ function MaintainMembers()
 	if (isset($_GET['done']) && $_GET['done'] == 'recountposts')
 		$context['maintenance_finished'] = $txt['maintain_recountposts'];
 
-	loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 }
 
 /**

diff --git a/Sources/ManageMembergroups.php b/Sources/ManageMembergroups.php
@@ -1171,9 +1171,9 @@ function EditMembergroup()
 
 	// Insert our JS, if we have possible icons.
 	if (!empty($context['possible_icons']))
-		loadJavascriptFile('icondropdown.js', array('validate' => true), 'smf_icondropdown');
+		loadJavaScriptFile('icondropdown.js', array('validate' => true), 'smf_icondropdown');
 
-		loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 
 	// Finally, get all the groups this could be inherited off.
 	$request = $smcFunc['db_query']('', '

diff --git a/Sources/ManageNews.php b/Sources/ManageNews.php
@@ -424,7 +424,7 @@ function SelectMailingMembers()
 
 	$context['can_send_pm'] = allowedTo('pm_send');
 
-	loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 }
 
 /**
@@ -1087,7 +1087,7 @@ function ModifyNewsSettings($return_config = false)
 	$context['post_url'] = $scripturl . '?action=admin;area=news;save;sa=settings';
 
 	// Add some javascript at the bottom...
-	addInlineJavascript('
+	addInlineJavaScript('
 	document.getElementById("xmlnews_maxlen").disabled = !document.getElementById("xmlnews_enable").checked;', true);
 
 	// Saving the settings?

diff --git a/Sources/ManagePaid.php b/Sources/ManagePaid.php
@@ -126,7 +126,7 @@ function ModifySubscriptionSettings($return_config = false)
 		$context['settings_title'] = $txt['settings'];
 
 		// We want javascript for our currency options.
-		addInlineJavascript('
+		addInlineJavaScript('
 		function toggleOther()
 		{
 			var otherOn = document.getElementById("paid_currency").value == \'other\';
@@ -1361,7 +1361,7 @@ function ModifyUserSubscription()
 		$context['sub']['end']['last_day'] = (int) strftime('%d', mktime(0, 0, 0, $context['sub']['end']['month'] == 12 ? 1 : $context['sub']['end']['month'] + 1, 0, $context['sub']['end']['month'] == 12 ? $context['sub']['end']['year'] + 1 : $context['sub']['end']['year']));
 	}
 
-	loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 }
 
 /**

diff --git a/Sources/ManageRegistration.php b/Sources/ManageRegistration.php
@@ -172,7 +172,7 @@ function AdminRegister()
 	$context['sub_template'] = 'admin_register';
 	$context['page_title'] = $txt['registration_center'];
 	createToken('admin-regc');
-	loadJavascriptFile('register.js', array('defer' => false), 'smf_register');
+	loadJavaScriptFile('register.js', array('defer' => false), 'smf_register');
 }
 
 /**

diff --git a/Sources/ManageSearchEngines.php b/Sources/ManageSearchEngines.php
@@ -146,7 +146,7 @@ function disableFields()
 	// Final settings...
 	$context['post_url'] = $scripturl . '?action=admin;area=sengines;save;sa=settings';
 	$context['settings_title'] = $txt['settings'];
-	addInlineJavascript($javascript_function, true);
+	addInlineJavaScript($javascript_function, true);
 
 	// Prepare the settings...
 	prepareDBSettingContext($config_vars);

diff --git a/Sources/ManageServer.php b/Sources/ManageServer.php
@@ -187,7 +187,7 @@ function ModifyGeneralSettings($return_config = false)
 	prepareServerSettingsContext($config_vars);
 
 	// Some javascript for SSL
-	addInlineJavascript('
+	addInlineJavaScript('
 $(function()
 {
 	$("#force_ssl").change(function()
@@ -291,7 +291,7 @@ function ModifyCookieSettings($return_config = false)
 		)), 'subtext' => $txt['tfa_mode_subtext'] . (empty($user_settings['tfa_secret']) ? '<br /><strong>' . $txt['tfa_mode_forced_help'] . '</strong>' : ''), 'tfa_mode'),
 	);
 
-	addInlineJavascript('
+	addInlineJavaScript('
 	function hideGlobalCookies()
 	{
 		var usingLocal = $("#localCookies").prop("checked");
@@ -309,7 +309,7 @@ function hideGlobalCookies()
 	});', true);
 
 	if (empty($user_settings['tfa_secret']))
-		addInlineJavascript('');
+		addInlineJavaScript('');
 
 	call_integration_hook('integrate_cookie_settings', array(&$config_vars));
 

diff --git a/Sources/ManageSettings.php b/Sources/ManageSettings.php
@@ -634,7 +634,7 @@ function ModifyAntispamSettings($return_config = false)
 	}
 
 	// Thirdly, push some JavaScript for the form to make it work.
-	addInlineJavascript('
+	addInlineJavaScript('
 	var nextrow = ' . (!empty($context['question_answers']) ? max(array_keys($context['question_answers'])) + 1 : 1) . ';
 	$(".qa_link a").click(function() {
 		var id = $(this).parent().attr("id").substring(6);
@@ -2111,7 +2111,7 @@ function ModifyLogSettings($return_config = false)
 	if ($return_config)
 		return $config_vars;
 
-	addInlineJavascript('
+	addInlineJavaScript('
 	function togglePruned()
 	{
 		var newval = $("#pruningOptions").prop("checked");

diff --git a/Sources/Memberlist.php b/Sources/Memberlist.php
@@ -567,7 +567,7 @@ function MLSearch()
 		$context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? $smcFunc['htmlspecialchars']($_POST['search']) : '');
 
 		// Since we're nice we also want to default focus on to the search field.
-		addInlineJavascript('
+		addInlineJavaScript('
 	$(\'input[name="search"]\').focus();', true);
 	}
 

diff --git a/Sources/MessageIndex.php b/Sources/MessageIndex.php
@@ -750,7 +750,7 @@ function MessageIndex()
 		);
 
 	// Javascript for inline editing.
-	loadJavascriptFile('topic.js', array('defer' => false), 'smf_topic');
+	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
 
 	// Allow adding new buttons easily.
 	// Note: $context['normal_buttons'] is added for backward compatibility with 2.0, but is deprecated and should not be used

diff --git a/Sources/ModerationCenter.php b/Sources/ModerationCenter.php
@@ -248,7 +248,7 @@ function ModerationHome()
 	global $txt, $context, $options;
 
 	loadTemplate('ModerationCenter');
-	loadJavascriptFile('admin.js', array(), 'smf_admin');
+	loadJavaScriptFile('admin.js', array(), 'smf_admin');
 
 	$context['page_title'] = $txt['moderation_center'];
 	$context['sub_template'] = 'moderation_center';

diff --git a/Sources/PackageGet.php b/Sources/PackageGet.php
@@ -170,7 +170,7 @@ function PackageServers()
 		}
 	}
 
-	addInlineJavascript('
+	addInlineJavaScript('
 	$(\'.new_package_content\').hide();
 	$(\'.download_new_package\').on(\'click\', function() {
 		var collapseState = $(\'.new_package_content\').css(\'display\');

diff --git a/Sources/Packages.php b/Sources/Packages.php
@@ -83,7 +83,7 @@ function Packages()
 	);
 
 	if ($context['sub_action'] == 'browse')
-		loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 
 	call_integration_hook('integrate_manage_packages', array(&$subActions));
 

diff --git a/Sources/PersonalMessage.php b/Sources/PersonalMessage.php
@@ -1727,8 +1727,8 @@ function MessagePost()
 	loadLanguage('PersonalMessage');
 	// Just in case it was loaded from somewhere else.
 	loadTemplate('PersonalMessage');
-	loadJavascriptFile('PersonalMessage.js', array('defer' => false), 'smf_pms');
-	loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	loadJavaScriptFile('PersonalMessage.js', array('defer' => false), 'smf_pms');
+	loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 	$context['sub_template'] = 'send';
 
 	// Extract out the spam settings - cause it's neat.
@@ -2038,8 +2038,8 @@ function messagePostError($error_types, $named_recipients, $recipient_ids = arra
 	if (!isset($_REQUEST['xml']))
 	{
 		$context['menu_data_' . $context['pm_menu_id']]['current_area'] = 'send';		$context['sub_template'] = 'send';
-		loadJavascriptFile('PersonalMessage.js', array('defer' => false), 'smf_pms');
-		loadJavascriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+		loadJavaScriptFile('PersonalMessage.js', array('defer' => false), 'smf_pms');
+		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 	}
 	else
 		$context['sub_template'] = 'pm';