Remove inline scripts from some layouts (joomla#57)

* Remove inline scripts from some layouts * Remove jQuery call * remove submenu JS file
Digital-Peak · Mar 11, 2018 · fb9c89e · fb9c89e
1 parent 2f4dd8e
commit fb9c89e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 53 deletions.
diff --git a/layouts/joomla/html/batch/adminlanguage.php b/layouts/joomla/html/batch/adminlanguage.php
@@ -19,30 +19,13 @@
  * None
  */
 
-Factory::getDocument()->addScriptDeclaration(
-	'
-		jQuery(document).ready(function($){
-			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
-			if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
-			if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");}
-			if ($("#batch-copy-move").length && batchSelector) {
-				$("#batch-copy-move").hide();
-				batchSelector.on("change", function(){
-					if (batchSelector.val() != 0 || batchSelector.val() != "") {
-						$("#batch-copy-move").show();
-					} else {
-						$("#batch-copy-move").hide();
-					}
-				});
-			}
-		});
-			'
-);
+HTMLHelper::_('script', 'system/fields/batch-language.min.js', ['version' => 'auto', 'relative' => true]);
+
 ?>
 <label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
 	<?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
 </label>
-<select name="batch[language_id]" class="inputbox" id="batch-language-id">
+<select name="batch[language_id]" class="custom-select" id="batch-language-id">
 	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
 	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('adminlanguage.existing', true, true), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
@@ -19,25 +19,8 @@
  * None
  */
 
-Factory::getDocument()->addScriptDeclaration(
-	'
-		jQuery(document).ready(function($){
-			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
-			if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
-			if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");}
-			if ($("#batch-copy-move").length && batchSelector) {
-				$("#batch-copy-move").hide();
-				batchSelector.on("change", function(){
-					if (batchSelector.val() != 0 || batchSelector.val() != "") {
-						$("#batch-copy-move").show();
-					} else {
-						$("#batch-copy-move").hide();
-					}
-				});
-			}
-		});
-			'
-);
+HTMLHelper::_('script', 'system/fields/batch-language.min.js', ['version' => 'auto', 'relative' => true]);
+
 ?>
 <label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
 	<?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>

diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
@@ -14,20 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Filter\OutputFilter;
 
-HTMLHelper::_('jquery.framework');
 HTMLHelper::_('behavior.core');
-
-Factory::getDocument()->addScriptDeclaration('
-	jQuery(document).ready(function($) {
-		if (window.toggleSidebar) {
-			toggleSidebar(true);
-		}
-		else {
-			$("#j-toggle-sidebar-header").css("display", "none");
-			$("#j-toggle-button-wrapper").css("display", "none");
-		}
-	});
-');
 ?>
 <?php if ($displayData->displayMenu || $displayData->displayFilters) : ?>
 <div id="j-toggle-sidebar-wrapper">
@@ -76,4 +63,4 @@
 	</div>
 	<div id="j-toggle-sidebar"></div>
 </div>
-<?php endif; ?>
+<?php endif; ?>
diff --git a/media/system/js/fields/batch-language.js b/media/system/js/fields/batch-language.js
@@ -0,0 +1,38 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(function() {
+	document.addEventListener('DOMContentLoaded', function() {
+
+		var batchSelector;
+
+		var batchCategory = document.getElementById('batch-category-id');
+		if (batchCategory) {
+			batchSelector = batchCategory;
+		}
+
+		var batchMenu = document.getElementById('batch-menu-id');
+		if (batchMenu) {
+			batchSelector = batchMenu;
+		}
+
+		var batchPosition = document.getElementById('batch-position-id');
+		if (batchPosition) {
+			batchSelector = batchPosition;
+		}
+
+		var batchCopyMove = document.getElementById('batch-copy-move');
+		if (batchCopyMove) {
+			batchSelector.addEventListener('change', function(){
+				if (batchSelector.value != 0 || batchSelector.value !== '') {
+					batchCopyMove.style.display = 'block';
+				} else {
+					batchCopyMove.style.display = 'none';
+				}
+			});
+		}
+
+	});
+})();