diff --git a/administrator/components/com_cck/helpers/scripts/list_live.php b/administrator/components/com_cck/helpers/scripts/list_live.php
index 0aa687742..b45bf892e 100644
--- a/administrator/components/com_cck/helpers/scripts/list_live.php
+++ b/administrator/components/com_cck/helpers/scripts/list_live.php
@@ -91,7 +91,7 @@ function getOptions( $string )
 echo $html;
 ?>
 
-<script type="text/javascript">
+<script>
 function CCK_setOptions(type) {
 	var elem = jQuery("#jform_params_"+type);
 	var len = type.length + 1;
diff --git a/administrator/components/com_cck/views/field/tmpl/edit.php b/administrator/components/com_cck/views/field/tmpl/edit.php
index df7bd479f..ac0d5c611 100644
--- a/administrator/components/com_cck/views/field/tmpl/edit.php
+++ b/administrator/components/com_cck/views/field/tmpl/edit.php
@@ -133,7 +133,7 @@
 Helper_Display::quickCopyright();
 ?>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev = {
 		doTranslation:"<?php echo JCck::getConfig_Param( 'language_jtext', 0 ); ?>",
diff --git a/administrator/components/com_cck/views/folder/tmpl/edit.php b/administrator/components/com_cck/views/folder/tmpl/edit.php
index ec0717e4e..649b3cc84 100644
--- a/administrator/components/com_cck/views/folder/tmpl/edit.php
+++ b/administrator/components/com_cck/views/folder/tmpl/edit.php
@@ -73,7 +73,7 @@
 Helper_Display::quickCopyright();
 ?>
 
-<script type="text/javascript">
+<script>
 (function ($){
     JCck.Dev = {
         submit: function(task) {
diff --git a/administrator/components/com_cck/views/folders/tmpl/default_app.php b/administrator/components/com_cck/views/folders/tmpl/default_app.php
index fc9e28f3b..4f2d7b0dc 100644
--- a/administrator/components/com_cck/views/folders/tmpl/default_app.php
+++ b/administrator/components/com_cck/views/folders/tmpl/default_app.php
@@ -79,7 +79,7 @@
 	</div>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {	
 	$(".app-download").on("click", function() {
 		var id = $(this).attr("data-id");
diff --git a/administrator/components/com_cck/views/form/tmpl/default.php b/administrator/components/com_cck/views/form/tmpl/default.php
index 6ef6e937a..4f265e92c 100644
--- a/administrator/components/com_cck/views/form/tmpl/default.php
+++ b/administrator/components/com_cck/views/form/tmpl/default.php
@@ -22,7 +22,7 @@
 }
 ?>
 
-<script type="text/javascript">
+<script>
 <?php echo $this->config['submit']; ?> = function(task) { <?php echo $js; ?> }
 </script>
 
diff --git a/administrator/components/com_cck/views/list/tmpl/default.php b/administrator/components/com_cck/views/list/tmpl/default.php
index 806287026..101915efb 100644
--- a/administrator/components/com_cck/views/list/tmpl/default.php
+++ b/administrator/components/com_cck/views/list/tmpl/default.php
@@ -26,7 +26,7 @@
 JFactory::getDocument()->addStyleDeclaration( $css );
 ?>
 
-<script type="text/javascript">
+<script>
 <?php echo $this->config['submit']; ?> = function(task) { <?php echo $js; ?> }
 Joomla.submitbutton = function(task, cid)
 {
diff --git a/administrator/components/com_cck/views/search/tmpl/edit.php b/administrator/components/com_cck/views/search/tmpl/edit.php
index 3fd6f488c..2c2d50470 100644
--- a/administrator/components/com_cck/views/search/tmpl/edit.php
+++ b/administrator/components/com_cck/views/search/tmpl/edit.php
@@ -138,7 +138,7 @@
 JText::script( 'COM_CCK_GET_FIELDS_FROM_VIEW_CONFIRM' );
 ?>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev = {
 		block_item:<?php echo $block_item; ?>,
diff --git a/administrator/components/com_cck/views/search/tmpl/edit2.php b/administrator/components/com_cck/views/search/tmpl/edit2.php
index 048ba0afe..ed710d3fc 100644
--- a/administrator/components/com_cck/views/search/tmpl/edit2.php
+++ b/administrator/components/com_cck/views/search/tmpl/edit2.php
@@ -33,7 +33,7 @@
 <div class="layers" id="layer_fields" <?php echo ( $this->item->layer == 'fields' ) ? '' : 'style="display: none;"'; ?>><?php include_once __DIR__.'/edit_fields_'.$this->uix.'.php'; ?></div>
 <div class="layers" id="layer_configuration" <?php echo ( $this->item->layer == 'configuration' ) ? '' : 'style="display: none;"'; ?>><?php include_once __DIR__.'/edit_configuration.php'; ?></div>
 <div class="layers" id="layer_template" <?php echo ( $this->item->layer == 'template' ) ? '' : 'style="display: none;"'; ?>><?php include_once __DIR__.'/edit_template.php'; ?></div>
-<script type="text/javascript">
+<script>
 JCck.DevHelper.setSidebar();
 (function ($){
 $("#pos-1 input:radio[name='positions']").prop("checked", true);
diff --git a/administrator/components/com_cck/views/session/tmpl/edit.php b/administrator/components/com_cck/views/session/tmpl/edit.php
index 3a48a979e..cf8aef495 100644
--- a/administrator/components/com_cck/views/session/tmpl/edit.php
+++ b/administrator/components/com_cck/views/session/tmpl/edit.php
@@ -56,7 +56,7 @@
 Helper_Display::quickCopyright();
 ?>
 
-<script type="text/javascript">
+<script>
 Joomla.submitbutton = function(task)
 {
 	JCck.submitForm(task, document.getElementById('adminForm'));
diff --git a/administrator/components/com_cck/views/site/tmpl/edit.php b/administrator/components/com_cck/views/site/tmpl/edit.php
index 6ac5ed80c..854ca235c 100644
--- a/administrator/components/com_cck/views/site/tmpl/edit.php
+++ b/administrator/components/com_cck/views/site/tmpl/edit.php
@@ -162,7 +162,7 @@
 Helper_Display::quickCopyright();
 ?>
 
-<script type="text/javascript">
+<script>
 (function ($){
     JCck.Dev = {
         submit: function(task) {
diff --git a/administrator/components/com_cck/views/template/tmpl/edit.php b/administrator/components/com_cck/views/template/tmpl/edit.php
index 8cbae39a5..b01ae4124 100644
--- a/administrator/components/com_cck/views/template/tmpl/edit.php
+++ b/administrator/components/com_cck/views/template/tmpl/edit.php
@@ -69,7 +69,7 @@
 Helper_Display::quickCopyright();
 ?>
 
-<script type="text/javascript">
+<script>
 (function ($){
     JCck.Dev = {
         submit: function(task) {
diff --git a/administrator/components/com_cck/views/type/tmpl/edit.php b/administrator/components/com_cck/views/type/tmpl/edit.php
index a25ff8c31..e1bd5ce29 100644
--- a/administrator/components/com_cck/views/type/tmpl/edit.php
+++ b/administrator/components/com_cck/views/type/tmpl/edit.php
@@ -131,7 +131,7 @@
 JText::script( 'COM_CCK_GET_FIELDS_FROM_VIEW_CONFIRM' );
 ?>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev = {
 		block_item:0,
diff --git a/administrator/components/com_cck/views/type/tmpl/edit2.php b/administrator/components/com_cck/views/type/tmpl/edit2.php
index e89d81af5..7891ae008 100644
--- a/administrator/components/com_cck/views/type/tmpl/edit2.php
+++ b/administrator/components/com_cck/views/type/tmpl/edit2.php
@@ -25,7 +25,7 @@
 <div class="layers" id="layer_fields" <?php echo ( $this->item->layer == 'fields' ) ? '' : 'style="display: none;"'; ?>><?php include_once __DIR__.'/edit_fields_'.$this->uix.'.php'; ?></div>
 <div class="layers" id="layer_configuration" <?php echo ( $this->item->layer == 'configuration' ) ? '' : 'style="display: none;"'; ?>><?php include_once __DIR__.'/edit_configuration.php'; ?></div>
 <div class="layers" id="layer_template" <?php echo ( $this->item->layer == 'template' ) ? '' : 'style="display: none;"'; ?>><?php include_once __DIR__.'/edit_template.php'; ?></div>
-<script type="text/javascript">
+<script>
 JCck.DevHelper.setSidebar();
 (function ($){
 $("#pos-1 input:radio[name='positions']").prop("checked", true);
diff --git a/administrator/components/com_cck/views/type/tmpl/edit_fields_compact.php b/administrator/components/com_cck/views/type/tmpl/edit_fields_compact.php
index 930f50616..018943b6b 100644
--- a/administrator/components/com_cck/views/type/tmpl/edit_fields_compact.php
+++ b/administrator/components/com_cck/views/type/tmpl/edit_fields_compact.php
@@ -91,7 +91,7 @@
 </div>
 <div class="clr" id="seblod-cleaner"></div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($){
 	$("div#scroll").slideToggle();
 	$(document).on("click", "#more_positions", function() {
diff --git a/administrator/components/com_cck/views/version/tmpl/edit.php b/administrator/components/com_cck/views/version/tmpl/edit.php
index 959da844e..6969503be 100644
--- a/administrator/components/com_cck/views/version/tmpl/edit.php
+++ b/administrator/components/com_cck/views/version/tmpl/edit.php
@@ -14,7 +14,7 @@
 Helper_Include::addDependencies( $this->getName(), $this->getLayout() );
 ?>
 
-<script type="text/javascript">
+<script>
 Joomla.submitbutton = function(task)
 {
 	JCck.submitForm(task, document.getElementById('adminForm'));
diff --git a/components/com_cck/helpers/helper_include.php b/components/com_cck/helpers/helper_include.php
index c30246ea4..703ed9a38 100644
--- a/components/com_cck/helpers/helper_include.php
+++ b/components/com_cck/helpers/helper_include.php
@@ -79,8 +79,8 @@ public static function addValidation( $rules, $options, $id = '', &$config = arr
 		
 		if ( $app->input->get( 'tmpl' ) == 'raw' ) {
 			echo '<link rel="stylesheet" href="'.$root.'/media/cck/css/cck.validation-3.9.0.css" type="text/css" />';
-			echo '<script src="'.$root.'/media/cck/js/cck.validation-3.11.1.min.js" type="text/javascript"></script>';
-			echo '<script type="text/javascript">'.$js.'</script>';
+			echo '<script src="'.$root.'/media/cck/js/cck.validation-3.11.1.min.js"></script>';
+			echo '<script>'.$js.'</script>';
 		} else {
 			$doc->addStyleSheet( $root.'/media/cck/css/cck.validation-3.9.0.css' );
 			$doc->addScript( $root.'/media/cck/js/cck.validation-3.11.1.min.js' );
diff --git a/components/com_cck/views/form/tmpl/edit.php b/components/com_cck/views/form/tmpl/edit.php
index ab9306201..b63fb9394 100644
--- a/components/com_cck/views/form/tmpl/edit.php
+++ b/components/com_cck/views/form/tmpl/edit.php
@@ -44,7 +44,7 @@
 	$js	=	'if (jQuery("#'.$this->form_id.'").isStillReady() === true) { jQuery("#'.$this->form_id.' input[name=\'config[unique]\']").val("'.$this->unique.'"); JCck.Core.submitForm(task, document.getElementById("'.$this->form_id.'")); }';
 }
 ?>
-<script type="text/javascript">
+<script>
 <?php echo $this->config['submit']; ?> = function(task) { <?php echo $js; ?> }
 </script>
 <?php
diff --git a/components/com_cck/views/list/tmpl/default.php b/components/com_cck/views/list/tmpl/default.php
index fff957738..37c7e3ffd 100644
--- a/components/com_cck/views/list/tmpl/default.php
+++ b/components/com_cck/views/list/tmpl/default.php
@@ -106,7 +106,7 @@
 	}
 }
 ?>
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Core.loadmore = function(more,stop,search) {
 		var elem = "<?php echo $pre; ?>.cck-loading-more";
@@ -161,7 +161,7 @@
 	}
 	$url	=	JUri::getInstance()->toString( array( 'scheme', 'host', 'port' ) ).$url;
 ?>
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Core.loadfragment = JCck.Core.getModal(<?php echo $this->json_resource ? $this->json_resource : '{}'; ?>);
 	$(document).ready(function() {
diff --git a/libraries/cck/construction/field/cck.php b/libraries/cck/construction/field/cck.php
index 276914593..09af8b609 100644
--- a/libraries/cck/construction/field/cck.php
+++ b/libraries/cck/construction/field/cck.php
@@ -175,7 +175,7 @@ protected function _addScripts( $id, $events, $format )
 			$js	=	'jQuery(document).ready(function($){'.$js.' '.$js2.' '.$js3.$js4.'});';
 			
 			if ( $format == 'raw' ) {
-				return '<script type="text/javascript">'.$js.'</script>';
+				return '<script>'.$js.'</script>';
 			} else {
 				$doc->addScriptDeclaration( $js );
 			}
diff --git a/libraries/cck/construction/field/cckjs.php b/libraries/cck/construction/field/cckjs.php
index a88c4665d..613170b3b 100644
--- a/libraries/cck/construction/field/cckjs.php
+++ b/libraries/cck/construction/field/cckjs.php
@@ -129,7 +129,7 @@ protected function _addScripts( $id, $events, $format )
 			$js	=	'jQuery(document).ready(function($){'.$js.' '.$js2.' '.$js3.'});';
 			
 			if ( $format == 'raw' ) {
-				return '<script type="text/javascript">'.$js.'</script>';
+				return '<script>'.$js.'</script>';
 			} else {
 				$doc->addScriptDeclaration( $js );
 			}
diff --git a/libraries/cck/construction/field/cckpicker.php b/libraries/cck/construction/field/cckpicker.php
index 90f63aa69..79d4dfd88 100644
--- a/libraries/cck/construction/field/cckpicker.php
+++ b/libraries/cck/construction/field/cckpicker.php
@@ -112,7 +112,7 @@ protected function _addScripts( $id, $params, $format )
 			$js	=	'jQuery(document).ready(function($){'.$js.'});';
 			
 			if ( $format == 'raw' ) {
-				return '<script type="text/javascript">'.$js.'</script>';
+				return '<script>'.$js.'</script>';
 			} else {
 				$doc->addScriptDeclaration( $js );
 			}
diff --git a/libraries/cck/rendering/rendering.php b/libraries/cck/rendering/rendering.php
index caf0f9532..27b599a87 100644
--- a/libraries/cck/rendering/rendering.php
+++ b/libraries/cck/rendering/rendering.php
@@ -401,7 +401,7 @@ public function finalize()
 			$js		=	'(function ($){'.$js."\n".'$(document).ready(function(){'.$this->js.'});})(jQuery);';
 
 			if ( $tmpl == 'raw' ) {
-				echo '<script type="text/javascript">'.$js.'</script>';
+				echo '<script>'.$js.'</script>';
 			} else {
 				$doc->addScriptDeclaration( $js );
 			}			
@@ -410,7 +410,7 @@ public function finalize()
 			$js		=	'(function ($){$(window).load(function(){'.$this->js2.'});})(jQuery);';
 
 			if ( $tmpl == 'raw' ) {
-				echo '<script type="text/javascript">'.$js.'</script>';
+				echo '<script>'.$js.'</script>';
 			} else {
 				$doc->addScriptDeclaration( $js );
 			}
diff --git a/libraries/cms/cck/cck.php b/libraries/cms/cck/cck.php
index e05987dbf..d9d2b2707 100644
--- a/libraries/cms/cck/cck.php
+++ b/libraries/cms/cck/cck.php
@@ -354,7 +354,7 @@ public static function loadjQuery( $noconflict = true, $more = true, $dev = fals
 			} elseif ( is_array( $dev ) && count( $dev ) ) {
 				if ( $app->input->get( 'tmpl' ) == 'raw' ) {
 					foreach ( $dev as $v ) {
-						echo '<script src="'.$root.'/media/cck/js/'.$v.'" type="text/javascript"></script>';
+						echo '<script src="'.$root.'/media/cck/js/'.$v.'"></script>';
 					}
 				} else {			
 					foreach ( $dev as $v ) {
diff --git a/libraries/cms/cck/dev.php b/libraries/cms/cck/dev.php
index bea6d6f04..5d28b9ee4 100644
--- a/libraries/cms/cck/dev.php
+++ b/libraries/cms/cck/dev.php
@@ -78,7 +78,7 @@ public static function forceStorage( $value = 'none', $allowed = '' )
 			$js	=	'if ( !$("#myid").val() ) { $("#storage").val( "'.$value.'" ); $("#force_storage").val( "1" ); }';
 		}
 		
-		echo '<script type="text/javascript">jQuery(document).ready(function($){'.$js.'});</script>';
+		echo '<script>jQuery(document).ready(function($){'.$js.'});</script>';
 	}
 	
 	public static function getMergedScript( $url )
@@ -359,7 +359,7 @@ public static function initScript( $type, &$elem, $options = array() )
 				echo '<style type="text/css">'.$css.'</style>';
 			}
 			if ( $js || $js2 ) {
-				echo '<script type="text/javascript">'.'jQuery(document).ready(function($){'.$js.$js2.'});'.$js3.'</script>';
+				echo '<script>'.'jQuery(document).ready(function($){'.$js.$js2.'});'.$js3.'</script>';
 			}
 			
 			return;
diff --git a/libraries/cms/cck/dev/tabs.php b/libraries/cms/cck/dev/tabs.php
index 4b46c3ce3..72419272e 100644
--- a/libraries/cms/cck/dev/tabs.php
+++ b/libraries/cms/cck/dev/tabs.php
@@ -41,7 +41,7 @@ public static function open( $selector, $id, $text )
 																	'active'=>$active,
 																	'title' => $text
 																) );
-	        	$html				.=	 '<script type="text/javascript">'.$js.'</script>';
+	        	$html				.=	 '<script>'.$js.'</script>';
 	        }
 
 			return $html;
@@ -63,7 +63,7 @@ public static function start( $selector, $id, $text, $params )
 																) );
 
 	        	$js					.=	JLayoutHelper::render( 'libraries.cms.html.bootstrap.starttabsetscript', array( 'selector' => $selector ) );;
-	        	$html				.=	 '<script type="text/javascript">'.$js.'</script>';
+	        	$html				.=	 '<script>'.$js.'</script>';
 	        }
 
 	        return $html;
diff --git a/libraries/cms/cck/plugin/field.php b/libraries/cms/cck/plugin/field.php
index da3217a2f..d6ef9dbc5 100644
--- a/libraries/cms/cck/plugin/field.php
+++ b/libraries/cms/cck/plugin/field.php
@@ -1020,7 +1020,7 @@ public static function g_addProcess( $event, $type, &$config, $params, $priority
 	public static function g_addScriptDeclaration( $script )
 	{
 		if ( JFactory::getApplication()->input->get( 'tmpl' ) == 'raw' ) {
-			echo '<script type="text/javascript">jQuery(document).ready(function($){'.$script.'});</script>';
+			echo '<script>jQuery(document).ready(function($){'.$script.'});</script>';
 		} else {
 			JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$script.'});' );
 		}
diff --git a/modules/mod_cck_form/tmpl/default.php b/modules/mod_cck_form/tmpl/default.php
index 849aa2222..cb2980a22 100644
--- a/modules/mod_cck_form/tmpl/default.php
+++ b/modules/mod_cck_form/tmpl/default.php
@@ -20,7 +20,7 @@
 	$js	=	'if (jQuery("#'.$formId.'").isStillReady() === true) { jQuery("#'.$formId.' input[name=\'config[unique]\']").val("'.$formId.'"); JCck.Core.submitForm("save", document.getElementById("'.$formId.'")); }';
 }
 ?>
-<script type="text/javascript">
+<script>
 <?php echo $config['submit']; ?> = function(task) { <?php echo $js; ?> }
 </script>
 <?php
diff --git a/modules/mod_cck_search/tmpl/default.php b/modules/mod_cck_search/tmpl/default.php
index 09d7013f7..61d17d541 100644
--- a/modules/mod_cck_search/tmpl/default.php
+++ b/modules/mod_cck_search/tmpl/default.php
@@ -38,7 +38,7 @@
 	$js	=	'JCck.Core.submitForm("search", document.getElementById("'.$formId.'"));';
 }
 ?>
-<script type="text/javascript">
+<script>
 <?php echo $config['submit']; ?> = function(task) { <?php echo $js; ?> }
 </script>
 <?php
diff --git a/plugins/cck_field/button_free/tmpl/edit.php b/plugins/cck_field/button_free/tmpl/edit.php
index fddd17d7a..5879901bd 100644
--- a/plugins/cck_field/button_free/tmpl/edit.php
+++ b/plugins/cck_field/button_free/tmpl/edit.php
@@ -62,7 +62,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#json_options2_icon').isVisibleWhen('bool6','1,2,3',false);
 	$('#bool3').isVisibleWhen('bool2','1,2');
diff --git a/plugins/cck_field/button_submit/tmpl/edit.php b/plugins/cck_field/button_submit/tmpl/edit.php
index 2116b375d..32d29e331 100644
--- a/plugins/cck_field/button_submit/tmpl/edit.php
+++ b/plugins/cck_field/button_submit/tmpl/edit.php
@@ -58,7 +58,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#bool6').isVisibleWhen('bool','1');
 	$('#blank_li3').isVisibleWhen('bool','0');
diff --git a/plugins/cck_field/calendar/calendar.php b/plugins/cck_field/calendar/calendar.php
index 4df8fb1ef..3ff3d7d34 100644
--- a/plugins/cck_field/calendar/calendar.php
+++ b/plugins/cck_field/calendar/calendar.php
@@ -337,8 +337,8 @@ protected static function _addScripts( $params = array() )
 			echo '<link rel="stylesheet" href="'.self::$path.'assets/css/jscal2.css'.'" type="text/css" />';
 			echo '<link rel="stylesheet" href="'.self::$path.'assets/css/border-radius.css'.'" type="text/css" />';
 			echo '<link rel="stylesheet" href="'.self::$path.'assets/css/theme/'.$params['theme'].'/'.$params['theme'].'.css'.'" type="text/css" />';
-			echo '<script src="'.self::$path.'assets/js/jscal2.js'.'" type="text/javascript"></script>';
-			echo '<script src="'.self::$path.$path.'" type="text/javascript"></script>';
+			echo '<script src="'.self::$path.'assets/js/jscal2.js'.'"></script>';
+			echo '<script src="'.self::$path.$path.'"></script>';
 		} else {
 			$doc->addStyleSheet( self::$path.'assets/css/jscal2.css' );
 			$doc->addStyleSheet( self::$path.'assets/css/border-radius.css' );
@@ -352,7 +352,7 @@ protected static function _addScripts( $params = array() )
 	protected static function _addScript( $id, $params = array() )
 	{
 		$js	=	'
-				<script type="text/javascript">
+				<script>
 					var cal = Calendar.setup({';
 		if ( $params['type'] == 'form' ) {
 			$id1	=	$id;
diff --git a/plugins/cck_field/calendar/tmpl/edit.php b/plugins/cck_field/calendar/tmpl/edit.php
index 4d3d769f8..214722561 100644
--- a/plugins/cck_field/calendar/tmpl/edit.php
+++ b/plugins/cck_field/calendar/tmpl/edit.php
@@ -49,7 +49,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#json_options2_time_pos').isVisibleWhen('json_options2_time','12,24',false);
 	$('#json_options2_default_hour').isVisibleWhen('json_options2_time','0');
diff --git a/plugins/cck_field/checkbox/tmpl/edit.php b/plugins/cck_field/checkbox/tmpl/edit.php
index 3575ff9a9..00020e86e 100644
--- a/plugins/cck_field/checkbox/tmpl/edit.php
+++ b/plugins/cck_field/checkbox/tmpl/edit.php
@@ -36,7 +36,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
     $('#bool2').isVisibleWhen('bool','1',false);
 });
diff --git a/plugins/cck_field/colorpicker/colorpicker.php b/plugins/cck_field/colorpicker/colorpicker.php
index 2e379c2d7..3a69b0c72 100644
--- a/plugins/cck_field/colorpicker/colorpicker.php
+++ b/plugins/cck_field/colorpicker/colorpicker.php
@@ -172,7 +172,7 @@ protected static function _addScripts( $id, $params = array(), &$config = array(
 					';
 		
 		if ( isset( $config['tmpl'] ) && $config['tmpl'] == 'ajax' ) {
-			echo '<script type="text/javascript">'.$js.'</script>';
+			echo '<script>'.$js.'</script>';
 		} else {
 			$doc->addStyleSheet( $s_css );
 			$doc->addScript( $s_js );
diff --git a/plugins/cck_field/email/tmpl/edit.php b/plugins/cck_field/email/tmpl/edit.php
index 8a6a21de5..b83d9dfd0 100644
--- a/plugins/cck_field/email/tmpl/edit.php
+++ b/plugins/cck_field/email/tmpl/edit.php
@@ -49,7 +49,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#json_options2_from_param').isVisibleWhen('json_options2_from','1,3',true,'visibility');
 	$('#json_options2_from_name_param').isVisibleWhen('json_options2_from_name','1,3',true,'visibility');
diff --git a/plugins/cck_field/field_x/field_x.php b/plugins/cck_field/field_x/field_x.php
index cb30e3cc1..e2cbccb08 100644
--- a/plugins/cck_field/field_x/field_x.php
+++ b/plugins/cck_field/field_x/field_x.php
@@ -354,10 +354,10 @@ protected static function _addScripts( $id, $params = array(), &$config = array(
 		
 		if ( isset( $config['tmpl'] ) && $config['tmpl'] == 'ajax' ) {
 			echo '<link rel="stylesheet" href="'.$css_s.'" type="text/css" />';
-			echo '<script type="text/javascript">'.$js.'</script>';
+			echo '<script>'.$js.'</script>';
 		} elseif ( $app->input->get( 'tmpl' ) == 'raw' ) {
 			echo '<link rel="stylesheet" href="'.$css_s.'" type="text/css" />';
-			echo '<script type="text/javascript">'.$js.'</script>';
+			echo '<script>'.$js.'</script>';
 		} else {
 			JCck::loadjQuery();
 			JCck::loadjQueryUI();
diff --git a/plugins/cck_field/group/group.php b/plugins/cck_field/group/group.php
index 0e185f457..81dec2780 100644
--- a/plugins/cck_field/group/group.php
+++ b/plugins/cck_field/group/group.php
@@ -401,7 +401,7 @@ protected static function _getHtml( $field, $group, $i, $size_group, &$config )
 		
 		if ( $js ) {
 			if ( JFactory::getApplication()->input->get( 'tmpl' ) == 'raw' ) {
-				echo '<script type="text/javascript">jQuery(document).ready(function($){'.$js.'});</script>';
+				echo '<script>jQuery(document).ready(function($){'.$js.'});</script>';
 			} else {
 				JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$js.'});' );
 			}
diff --git a/plugins/cck_field/group_x/group_x.php b/plugins/cck_field/group_x/group_x.php
index 712ab0d2d..b948c6ee9 100644
--- a/plugins/cck_field/group_x/group_x.php
+++ b/plugins/cck_field/group_x/group_x.php
@@ -455,7 +455,7 @@ protected static function _addScripts()
 		JCck::loadjQueryUI();
 
 		if ( $app->input->get( 'tmpl' ) == 'raw' ) {
-			echo '<script src="'.self::$path.'assets/js/script2.js'.'" type="text/javascript"></script>';
+			echo '<script src="'.self::$path.'assets/js/script2.js'.'"></script>';
 		} else {
 			$doc->addScript( self::$path.'assets/js/script2.js' );
 		}
@@ -498,7 +498,7 @@ protected static function _addScript( $id, $params = array() )
 		$js	.=	'});';
 		
 		if ( $app->input->get( 'tmpl' ) == 'raw' ) {
-			echo '<script type="text/javascript">'.$js.'</script>';
+			echo '<script>'.$js.'</script>';
 		} else {
 			$doc ->addScriptDeclaration( $js );
 		}
@@ -616,7 +616,7 @@ protected static function _getHtmlTable( $field, $group, $i, $size_group, $butto
 
 		if ( $js ) {
 			if ( $js_format == 'raw' ) {
-				$html	.=	'<script type="text/javascript">(function ($){'.$js.'})(jQuery);</script>';
+				$html	.=	'<script>(function ($){'.$js.'})(jQuery);</script>';
 			} else {
 				JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$js.'});' );
 			}
@@ -766,7 +766,7 @@ protected static function _getHtml( $field, $group, $i, $size_group, $buttons, &
 		
 		if ( $js ) {
 			if ( $js_format == 'raw' ) {
-				$html	.=	'<script type="text/javascript">(function ($){'.$js.'})(jQuery);</script>';
+				$html	.=	'<script>(function ($){'.$js.'})(jQuery);</script>';
 			} else {
 				JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$js.'});' );
 			}
diff --git a/plugins/cck_field/jform_category/tmpl/edit.php b/plugins/cck_field/jform_category/tmpl/edit.php
index 53594dd62..1b62c7789 100644
--- a/plugins/cck_field/jform_category/tmpl/edit.php
+++ b/plugins/cck_field/jform_category/tmpl/edit.php
@@ -30,7 +30,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#rows').isVisibleWhen('bool3','1');
 });
diff --git a/plugins/cck_field/jform_tag/tmpl/edit.php b/plugins/cck_field/jform_tag/tmpl/edit.php
index 9d71fb909..213e0dbaa 100644
--- a/plugins/cck_field/jform_tag/tmpl/edit.php
+++ b/plugins/cck_field/jform_tag/tmpl/edit.php
@@ -30,7 +30,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
     $('#bool3').isVisibleWhen('json_options2_parent','0');
 });
diff --git a/plugins/cck_field/radio/tmpl/edit.php b/plugins/cck_field/radio/tmpl/edit.php
index b391d9062..ac4c23856 100644
--- a/plugins/cck_field/radio/tmpl/edit.php
+++ b/plugins/cck_field/radio/tmpl/edit.php
@@ -34,7 +34,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
     $('#bool2').isVisibleWhen('bool','1',false);
 });
diff --git a/plugins/cck_field/select_dynamic/tmpl/edit.php b/plugins/cck_field/select_dynamic/tmpl/edit.php
index 812960d54..bfa7f4562 100644
--- a/plugins/cck_field/select_dynamic/tmpl/edit.php
+++ b/plugins/cck_field/select_dynamic/tmpl/edit.php
@@ -73,7 +73,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#json_options2_query').isVisibleWhen('bool2','1');
 	$('#json_options2_table, #json_options2_name, #json_options2_value, #json_options2_where, #json_options2_orderby, #json_options2_limit, #blank_li').isVisibleWhen('bool2','0');
diff --git a/plugins/cck_field/storage/tmpl/form.php b/plugins/cck_field/storage/tmpl/form.php
index 1e3b88fb2..7bf310011 100644
--- a/plugins/cck_field/storage/tmpl/form.php
+++ b/plugins/cck_field/storage/tmpl/form.php
@@ -199,7 +199,7 @@
     <div id="toggle_more2" class="toggle_more closed" <?php echo ( $value != 'dev' ) ? '' : 'style="display: none;"'?>></div>
 </div>
 
-<script type="text/javascript">
+<script>
 <?php echo $js; ?>
 </script>
 
diff --git a/plugins/cck_field/tabs/tmpl/edit.php b/plugins/cck_field/tabs/tmpl/edit.php
index ee20181e5..307fe9e62 100644
--- a/plugins/cck_field/tabs/tmpl/edit.php
+++ b/plugins/cck_field/tabs/tmpl/edit.php
@@ -33,7 +33,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
     $('#defaultvalue').isVisibleWhen('bool','0',false);
     $('#bool2,#bool3').isVisibleWhen('bool','0');
diff --git a/plugins/cck_field/upload_file/tmpl/edit.php b/plugins/cck_field/upload_file/tmpl/edit.php
index c730421e8..202957df0 100644
--- a/plugins/cck_field/upload_file/tmpl/edit.php
+++ b/plugins/cck_field/upload_file/tmpl/edit.php
@@ -57,7 +57,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#json_options2_legal_extensions').isVisibleWhen('json_options2_media_extensions','custom',false);
 	$('#json_options2_title_file').isVisibleWhen('json_options2_multivalue_mode','1');
diff --git a/plugins/cck_field/upload_image/tmpl/edit.php b/plugins/cck_field/upload_image/tmpl/edit.php
index 83d92e3c6..e672aca9a 100644
--- a/plugins/cck_field/upload_image/tmpl/edit.php
+++ b/plugins/cck_field/upload_image/tmpl/edit.php
@@ -91,7 +91,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#json_options2_legal_extensions').isVisibleWhen('json_options2_media_extensions','custom',false);
 	$('#json_options2_image_width').isVisibleWhen('json_options2_image_process','addcolor,crop,crop_dynamic,maxfit,shrink,stretch,stretch_dynamic,shrink_dynamic',true,'visibility');
diff --git a/plugins/cck_field/wysiwyg_editor/tmpl/edit.php b/plugins/cck_field/wysiwyg_editor/tmpl/edit.php
index 81243e3b0..40ce2a9d7 100644
--- a/plugins/cck_field/wysiwyg_editor/tmpl/edit.php
+++ b/plugins/cck_field/wysiwyg_editor/tmpl/edit.php
@@ -39,7 +39,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('selectlabel').isVisibleWhen('bool','0',true);
 });
diff --git a/plugins/cck_field_link/cck_form/tmpl/edit.php b/plugins/cck_field_link/cck_form/tmpl/edit.php
index dd6c106d1..aceb4dd9e 100644
--- a/plugins/cck_field_link/cck_form/tmpl/edit.php
+++ b/plugins/cck_field_link/cck_form/tmpl/edit.php
@@ -47,7 +47,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#form_edition,#blank_li').isVisibleWhen('form','');
 	$('#form_fieldname').isVisibleWhen('form','-2');
diff --git a/plugins/cck_field_link/cck_list/tmpl/edit.php b/plugins/cck_field_link/cck_list/tmpl/edit.php
index 5db7ad7f9..96d80ff07 100644
--- a/plugins/cck_field_link/cck_list/tmpl/edit.php
+++ b/plugins/cck_field_link/cck_list/tmpl/edit.php
@@ -43,7 +43,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#search_fieldname').isVisibleWhen('search_field','1');
 });
diff --git a/plugins/cck_field_link/content/tmpl/edit.php b/plugins/cck_field_link/content/tmpl/edit.php
index 9dfa85529..2358de2a3 100644
--- a/plugins/cck_field_link/content/tmpl/edit.php
+++ b/plugins/cck_field_link/content/tmpl/edit.php
@@ -59,7 +59,7 @@
 JCckDev::initScript( 'link', $this->item );
 ?>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#itemid').isDisabledWhen('sef','0');
 	$('#itemid_fieldname,#blank_li2').isVisibleWhen('itemid','-2');
diff --git a/plugins/cck_field_link/content_delete/tmpl/edit.php b/plugins/cck_field_link/content_delete/tmpl/edit.php
index 0a33fdaee..047970b89 100644
--- a/plugins/cck_field_link/content_delete/tmpl/edit.php
+++ b/plugins/cck_field_link/content_delete/tmpl/edit.php
@@ -39,7 +39,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#title_custom').isVisibleWhen('title','2',false);
 	$('#redirection_url,#blank_li').isVisibleWhen('redirection','url');
diff --git a/plugins/cck_field_live/joomla_user/tmpl/edit.php b/plugins/cck_field_live/joomla_user/tmpl/edit.php
index 948aad8fa..1ca9db0f9 100644
--- a/plugins/cck_field_live/joomla_user/tmpl/edit.php
+++ b/plugins/cck_field_live/joomla_user/tmpl/edit.php
@@ -25,7 +25,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#excluded').isVisibleWhen('property','access,groups');
 });
diff --git a/plugins/cck_field_live/url_variable/tmpl/edit.php b/plugins/cck_field_live/url_variable/tmpl/edit.php
index ca7eaa450..0503f0f11 100644
--- a/plugins/cck_field_live/url_variable/tmpl/edit.php
+++ b/plugins/cck_field_live/url_variable/tmpl/edit.php
@@ -31,7 +31,7 @@
 JCckDev::initScript( 'live', $this->item );
 ?>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#sortable_core_dev_texts, #return').isVisibleWhen('multiple','1');
 	$('#variable,#default_value,#crypt').isVisibleWhen('multiple','0');
diff --git a/plugins/cck_field_restriction/url_variable/tmpl/edit.php b/plugins/cck_field_restriction/url_variable/tmpl/edit.php
index 4b481efe6..6bb021ebc 100644
--- a/plugins/cck_field_restriction/url_variable/tmpl/edit.php
+++ b/plugins/cck_field_restriction/url_variable/tmpl/edit.php
@@ -28,7 +28,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#values').isVisibleWhen('match','isEqual',false);
 });
diff --git a/plugins/cck_field_typo/date/tmpl/edit.php b/plugins/cck_field_typo/date/tmpl/edit.php
index 51872d01a..e88ea5b4c 100644
--- a/plugins/cck_field_typo/date/tmpl/edit.php
+++ b/plugins/cck_field_typo/date/tmpl/edit.php
@@ -32,7 +32,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('ul li:first label, ul li:nth-child(4) label').css('width','115px');
 	$('#format_custom').isVisibleWhen('format','-1');
diff --git a/plugins/cck_field_typo/image/tmpl/edit.php b/plugins/cck_field_typo/image/tmpl/edit.php
index 75000c5db..61a3624de 100644
--- a/plugins/cck_field_typo/image/tmpl/edit.php
+++ b/plugins/cck_field_typo/image/tmpl/edit.php
@@ -54,7 +54,7 @@
     </ul>
 </div>
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#thumb_width_custom').isVisibleWhen('thumb_custom','1',false);
 	$('#image_width_custom').isVisibleWhen('image_custom','1,2,3',false);
diff --git a/plugins/cck_field_typo/joomla_jgrid/tmpl/edit.php b/plugins/cck_field_typo/joomla_jgrid/tmpl/edit.php
index 25b130b71..a321663e3 100644
--- a/plugins/cck_field_typo/joomla_jgrid/tmpl/edit.php
+++ b/plugins/cck_field_typo/joomla_jgrid/tmpl/edit.php
@@ -44,7 +44,7 @@
 </div>
 
 
-<script type="text/javascript">
+<script>
 jQuery(document).ready(function($) {
 	$('#class').isVisibleWhen('type','activation,block,featured,state');
 	$('#class1').isVisibleWhen('type','dropdown');
diff --git a/plugins/cck_storage_location/joomla_article/tmpl/exporter.php b/plugins/cck_storage_location/joomla_article/tmpl/exporter.php
index 23440303e..b9abdd276 100644
--- a/plugins/cck_storage_location/joomla_article/tmpl/exporter.php
+++ b/plugins/cck_storage_location/joomla_article/tmpl/exporter.php
@@ -27,7 +27,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev.applyConditionalStates = function() {
 		$('#columns_core_selected').isVisibleWhen('columns_core','1');
diff --git a/plugins/cck_storage_location/joomla_article/tmpl/importer.php b/plugins/cck_storage_location/joomla_article/tmpl/importer.php
index 54f2df7fe..6ecbd1bfd 100644
--- a/plugins/cck_storage_location/joomla_article/tmpl/importer.php
+++ b/plugins/cck_storage_location/joomla_article/tmpl/importer.php
@@ -36,7 +36,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev.applyConditionalStates = function() {
 		$('#options_key_fieldname').isVisibleWhen('options_key','-1');
diff --git a/plugins/cck_storage_location/joomla_category/tmpl/exporter.php b/plugins/cck_storage_location/joomla_category/tmpl/exporter.php
index 7501344f4..04ef7bcd3 100644
--- a/plugins/cck_storage_location/joomla_category/tmpl/exporter.php
+++ b/plugins/cck_storage_location/joomla_category/tmpl/exporter.php
@@ -27,7 +27,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev.applyConditionalStates = function() {
 		$('#columns_core_selected').isVisibleWhen('columns_core','1');
diff --git a/plugins/cck_storage_location/joomla_category/tmpl/importer.php b/plugins/cck_storage_location/joomla_category/tmpl/importer.php
index b762c084d..520f2d179 100644
--- a/plugins/cck_storage_location/joomla_category/tmpl/importer.php
+++ b/plugins/cck_storage_location/joomla_category/tmpl/importer.php
@@ -30,7 +30,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev.applyConditionalStates = function() {
 		$('#options_key_fieldname').isVisibleWhen('options_key','-1');
diff --git a/plugins/cck_storage_location/joomla_user/tmpl/exporter.php b/plugins/cck_storage_location/joomla_user/tmpl/exporter.php
index ab313a423..518cfba54 100644
--- a/plugins/cck_storage_location/joomla_user/tmpl/exporter.php
+++ b/plugins/cck_storage_location/joomla_user/tmpl/exporter.php
@@ -27,7 +27,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 (function ($){
 	JCck.Dev.applyConditionalStates = function() {
 		$('#columns_core_selected').isVisibleWhen('columns_core','1');