Merge pull request joomla#8924 from dgt41/noMootoolsInstallation

Regression CMS installation needs mootools for the xtra languages
hamby · Jan 18, 2016 · c8f9660 · c8f9660
2 parents 26eac54 + 5ef1565
commit c8f9660
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php
@@ -8,6 +8,18 @@
 
 defined('_JEXEC') or die;
 
+JFactory::getDocument()->addScriptDeclaration(
+<<<JS
+	jQuery(document).ready(function($) {
+		$(':input[name="jform[activateMultilanguage]"]').each(function(el){
+			$(this).click(function(){Install.toggle('installLocalisedContent', 'activateMultilanguage', 1);});
+			$(this).click(function(){Install.toggle('activatePluginLanguageCode', 'activateMultilanguage', 1);});
+		});
+		Install.toggle('installLocalisedContent', 'activateMultilanguage', 1);
+		Install.toggle('activatePluginLanguageCode', 'activateMultilanguage', 1);
+	});
+JS
+);
 ?>
 <?php echo JHtml::_('InstallationHtml.helper.stepbarlanguages'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate form-horizontal">
@@ -104,7 +116,7 @@ class="btn btn-primary"
 						name="administratorlang"
 						value="<?php echo $lang->language; ?>"
 						<?php if ($lang->published) echo 'checked="checked"'; ?>
-						/>
+					/>
 				</td>
 				<td align="center">
 					<label for="admin-language-cb<?php echo $i; ?>">
@@ -145,7 +157,7 @@ class="btn btn-primary"
 						name="frontendlang"
 						value="<?php echo $lang->language; ?>"
 						<?php if ($lang->published) echo 'checked="checked"'; ?>
-						/>
+					/>
 				</td>
 				<td align="center">
 					<label for="site-language-cb<?php echo $i; ?>">
@@ -189,14 +201,3 @@ class="btn btn-primary"
 	<input type="hidden" name="task" value="setdefaultlanguage" />
 	<?php echo JHtml::_('form.token'); ?>
 </form>
-
-<script type="text/javascript">
-	window.addEvent('domready', function() {
-		document.getElements('input[name=jform[activateMultilanguage]]').each(function(el){
-			el.addEvent('click', function(){Install.toggle('installLocalisedContent', 'activateMultilanguage', 1);});
-			el.addEvent('click', function(){Install.toggle('activatePluginLanguageCode', 'activateMultilanguage', 1);});
-		});
-		Install.toggle('installLocalisedContent', 'activateMultilanguage', 1);
-		Install.toggle('activatePluginLanguageCode', 'activateMultilanguage', 1);
-	});
-</script>