Pārlūkot izejas kodu

! We have a function for adding JS, let's use it.

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 gadi atpakaļ
vecāks
revīzija
ddc3fc11b2

+ 2 - 4
Sources/ManageBoards.php

@@ -858,10 +858,8 @@ function EditBoardSettings($return_config = false)
 	$context['sub_template'] = 'show_settings';
 
 	// Add some javascript stuff for the recycle box.
-	$context['settings_insert_below'] = '
-		<script type="text/javascript"><!-- // --><![CDATA[
-			document.getElementById("recycle_board").disabled = !document.getElementById("recycle_enable").checked;
-		// ]]></script>';
+	addInlineJavascript('
+	document.getElementById("recycle_board").disabled = !document.getElementById("recycle_enable").checked;', true);
 
 	// Warn the admin against selecting the recycle topic without selecting a board.
 	$context['force_form_onsubmit'] = 'if(document.getElementById(\'recycle_enable\').checked && document.getElementById(\'recycle_board\').value == 0) { return confirm(\'' . $txt['recycle_board_unselected_notice'] . '\');} return true;';

+ 2 - 4
Sources/ManageNews.php

@@ -1069,10 +1069,8 @@ function ModifyNewsSettings($return_config = false)
 	$context['permissions_excluded'] = array(-1);
 
 	// Add some javascript at the bottom...
-	$context['settings_insert_below'] = '
-		<script type="text/javascript"><!-- // --><![CDATA[
-			document.getElementById("xmlnews_maxlen").disabled = !document.getElementById("xmlnews_enable").checked;
-		// ]]></script>';
+	addInlineJavascript('
+	document.getElementById("xmlnews_maxlen").disabled = !document.getElementById("xmlnews_enable").checked;', true);
 
 	// Saving the settings?
 	if (isset($_GET['save']))

+ 23 - 25
Sources/ManagePaid.php

@@ -125,38 +125,36 @@ function ModifySubscriptionSettings($return_config = false)
 		$context['settings_title'] = $txt['settings'];
 
 		// We want javascript for our currency options.
-		$context['settings_insert_below'] = '
-		<script type="text/javascript"><!-- // --><![CDATA[
-			function toggleOther()
+		addInlineJavascript('
+		function toggleOther()
+		{
+			var otherOn = document.getElementById("paid_currency").value == \'other\';
+			var currencydd = document.getElementById("custom_currency_code_div_dd");
+
+			if (otherOn)
 			{
-				var otherOn = document.getElementById("paid_currency").value == \'other\';
-				var currencydd = document.getElementById("custom_currency_code_div_dd");
+				document.getElementById("custom_currency_code_div").style.display = "";
+				document.getElementById("custom_currency_symbol_div").style.display = "";
 
-				if (otherOn)
+				if (currencydd)
 				{
-					document.getElementById("custom_currency_code_div").style.display = "";
-					document.getElementById("custom_currency_symbol_div").style.display = "";
-
-					if (currencydd)
-					{
-						document.getElementById("custom_currency_code_div_dd").style.display = "";
-						document.getElementById("custom_currency_symbol_div_dd").style.display = "";
-					}
+					document.getElementById("custom_currency_code_div_dd").style.display = "";
+					document.getElementById("custom_currency_symbol_div_dd").style.display = "";
 				}
-				else
-				{
-					document.getElementById("custom_currency_code_div").style.display = "none";
-					document.getElementById("custom_currency_symbol_div").style.display = "none";
+			}
+			else
+			{
+				document.getElementById("custom_currency_code_div").style.display = "none";
+				document.getElementById("custom_currency_symbol_div").style.display = "none";
 
-					if (currencydd)
-					{
-						document.getElementById("custom_currency_symbol_div_dd").style.display = "none";
-						document.getElementById("custom_currency_code_div_dd").style.display = "none";
-					}
+				if (currencydd)
+				{
+					document.getElementById("custom_currency_symbol_div_dd").style.display = "none";
+					document.getElementById("custom_currency_code_div_dd").style.display = "none";
 				}
 			}
-			toggleOther();
-		// ]]></script>';
+		}
+		toggleOther();', true);
 	}
 	else
 	{

+ 1 - 4
Sources/ManageSearchEngines.php

@@ -145,10 +145,7 @@ function ManageSearchEngineSettings($return_config = false)
 	// Final settings...
 	$context['post_url'] = $scripturl . '?action=admin;area=sengines;save;sa=settings';
 	$context['settings_title'] = $txt['settings'];
-	$context['settings_insert_below'] = '
-		<script type="text/javascript"><!-- // --><![CDATA[
-			' . $javascript_function . '
-		// ]]></script>';
+	addInlineJavascript($javascript_function, true);
 
 	// Prepare the settings...
 	prepareDBSettingContext($config_vars);