Fixed issue [#21247] HTML comments shouldn't be used to guard JavaScr…

…ipt (Rouven Weßling). git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@18204 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
joomla · Jul 22, 2010 · 7819849 · 7819849
1 parent a2c6344
commit 7819849
Show file tree

Hide file tree

Showing 56 changed files with 9 additions and 121 deletions.
diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -15,7 +15,6 @@
 JHtml::_('behavior.formvalidation');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'banner.cancel' || document.formvalidator.isValid(document.id('banner-form'))) {
@@ -39,7 +38,6 @@ function submitbutton(task)
 			document.id('jform_type1').fireEvent('click');
 		}
 	});
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_banners'); ?>" method="post" name="adminForm" id="banner-form" class="form-validate">

diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -15,14 +15,12 @@
 JHtml::_('behavior.formvalidation');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'client.cancel' || document.formvalidator.isValid(document.id('client-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_banners'); ?>" method="post" name="adminForm" id="client-form" class="form-validate">

diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php
@@ -12,7 +12,6 @@
 JHtml::_('behavior.tooltip');
 ?>
 <script type="text/javascript">
-<!--
 	window.addEvent('domready', function() {
 		document.id('jform_compressed1').addEvent('click', function(e){
 			document.id('jform_inline0').checked=false;
@@ -23,7 +22,6 @@
 			document.id('jform_compressed1').checked=false;
 		});
 	});
-// -->
 </script>
 <form
 	action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw');?>"

diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -21,7 +21,6 @@
 ?>
 
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'category.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
@@ -32,7 +31,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">

diff --git a/administrator/components/com_config/views/application/tmpl/default.php b/administrator/components/com_config/views/application/tmpl/default.php
@@ -20,14 +20,12 @@
 
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'application.cancel' || document.formvalidator.isValid(document.id('application-form'))) {
 			submitform(task);
 		}
 	}
--->
 </script>
 
 <form action="<?php echo JRoute::_('index.php?option=com_config');?>" id="application-form" method="post" name="adminForm" class="form-validate">

diff --git a/administrator/components/com_config/views/component/tmpl/default.php b/administrator/components/com_config/views/component/tmpl/default.php
@@ -17,14 +17,12 @@
 JHtml::_('behavior.formvalidation');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (document.formvalidator.isValid(document.id('component-form'))) {
 			submitform(task);
 		}
 	}
--->
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_config');?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate">
 	<fieldset>

diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php
@@ -16,7 +16,6 @@
 JHtml::_('behavior.formvalidation');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'contact.cancel' || document.formvalidator.isValid(document.id('contact-form'))) {
@@ -27,7 +26,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_contact'); ?>" method="post" name="adminForm" id="contact-form" class="form-validate">

diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php
@@ -19,7 +19,6 @@
 ?>
 
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'article.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
@@ -30,7 +29,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_content'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">

diff --git a/administrator/components/com_installer/views/install/tmpl/default_form.php b/administrator/components/com_installer/views/install/tmpl/default_form.php
@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton3(pressbutton) {
 		var form = document.adminForm;
 
@@ -36,7 +35,6 @@ function submitbutton4(pressbutton) {
 			form.submit();
 		}
 	}
-//-->
 </script>
 
 <form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install');?>" method="post" name="adminForm">

diff --git a/administrator/components/com_languages/views/language/tmpl/edit.php b/administrator/components/com_languages/views/language/tmpl/edit.php
@@ -15,14 +15,12 @@
 JHtml::_('behavior.formvalidation');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'language.cancel' || document.formvalidator.isValid(document.id('language-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_languages'); ?>" method="post" name="adminForm" id="language-form" class="form-validate">

diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.php b/administrator/components/com_menus/views/menu/tmpl/edit.php
@@ -18,14 +18,12 @@
 ?>
 
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'menu.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form">

diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php
@@ -21,13 +21,11 @@
 $listDirn	= $this->state->get('list.direction');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task) {
 		if (task != 'menus.delete' || confirm('<?php echo JText::_('COM_MENUS_MENU_CONFIRM_DELETE',true);?>')) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_menus&view=menus');?>" method="post" name="adminForm">
 	<table class="adminlist">

diff --git a/administrator/components/com_messages/views/config/tmpl/default.php b/administrator/components/com_messages/views/config/tmpl/default.php
@@ -17,14 +17,12 @@
 JHtml::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'config.cancel' || document.formvalidator.isValid(document.id('config-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form" class="form-validate">
 	<fieldset>

diff --git a/administrator/components/com_messages/views/message/tmpl/edit.php b/administrator/components/com_messages/views/message/tmpl/edit.php
@@ -17,13 +17,11 @@
 JHtml::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task) {
 		if (task == 'message.cancel' || document.formvalidator.isValid(document.id('message-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form" class="form-validate">
 	<div class="width-100">

diff --git a/administrator/components/com_modules/models/fields/moduleorder.php b/administrator/components/com_modules/models/fields/moduleorder.php
@@ -48,7 +48,6 @@ protected function getInput()
 		$attr .= $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
 
 		$html[] = '<script type="text/javascript">';
-		$html[] = '<!-- ';
 
 		$ordering = $this->form->getValue('ordering');
 		$position = $this->form->getValue('position');
@@ -86,7 +85,6 @@ protected function getInput()
 		}
 
 		$html[] = 'writeDynaList(\'name="'.$this->name.'" id="'.$this->id.'"'.$attr.'\', orders, originalPos, originalPos, originalOrder);';
-		$html[] = ' //-->';
 		$html[] = '</script>';
 
 		return implode("\n", $html);

diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -18,7 +18,6 @@
 $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $this->item->module == 'mod_custom';
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'module.cancel' || document.formvalidator.isValid(document.id('module-form'))) {
@@ -33,7 +32,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('COM_MODULES_ERROR_TITLE'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_modules'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">

diff --git a/administrator/components/com_modules/views/module/tmpl/modal.php b/administrator/components/com_modules/views/module/tmpl/modal.php
@@ -20,7 +20,6 @@
 $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $this->item->module == 'mod_custom';
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'module.cancel' || document.formvalidator.isValid(document.id('module-form'))) {
@@ -34,7 +33,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_modules&layout=modal&tmpl=component'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">

diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
@@ -18,7 +18,6 @@
 
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'newsfeed.cancel' || document.formvalidator.isValid(document.id('newsfeed-form'))) {
@@ -28,7 +27,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php echo JRoute::_('index.php?option=com_newsfeeds'); ?>" method="post" name="adminForm" id="newsfeed-form" class="form-validate">

diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -15,14 +15,12 @@
 JHtml::_('behavior.formvalidation');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'plugin.cancel' || document.formvalidator.isValid(document.id('style-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">

diff --git a/administrator/components/com_redirect/views/link/tmpl/edit.php b/administrator/components/com_redirect/views/link/tmpl/edit.php
@@ -18,14 +18,12 @@
 
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'link.cancel' || document.formvalidator.isValid(document.id('link-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php echo JRoute::_('index.php?option=com_redirect'); ?>" method="post" name="adminForm" id="link-form" class="form-validate">

diff --git a/administrator/components/com_templates/views/source/tmpl/edit.php b/administrator/components/com_templates/views/source/tmpl/edit.php
@@ -16,7 +16,6 @@
 JHtml::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'source.cancel' || document.formvalidator.isValid(document.id('source-form'))) {
@@ -27,7 +26,6 @@ function submitbutton(task)
 			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="source-form" class="form-validate">

diff --git a/administrator/components/com_templates/views/style/tmpl/edit.php b/administrator/components/com_templates/views/style/tmpl/edit.php
@@ -16,14 +16,12 @@
 $user = JFactory::getUser();
 ?>
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'style.cancel' || document.formvalidator.isValid(document.id('style-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">

diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php
@@ -19,14 +19,12 @@
 ?>
 
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'group.cancel' || document.formvalidator.isValid(document.id('group-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="group-form" class="form-validate">

diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php
@@ -19,7 +19,6 @@
 ?>
 
 <script type="text/javascript">
-<!--
 function submitbutton(task)
 {
 	if (task == 'level.cancel' || document.formvalidator.isValid(document.id('level-form'))) {
@@ -85,7 +84,6 @@ function submitbutton(task)
 	});
 });
 */
-// -->
 </script>
 
 

diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php
@@ -21,14 +21,12 @@
 ?>
 
 <script type="text/javascript">
-<!--
 	function submitbutton(task)
 	{
 		if (task == 'user.cancel' || document.formvalidator.isValid(document.id('user-form'))) {
 			submitform(task);
 		}
 	}
-// -->
 </script>
 
 <form action="<?php JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="user-form" class="form-validate">