Merge branch 'johndoh-html5'

CHANGELOG

@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Enigma: Add script to import keys from filesystem to the db storage (for multihost)
+- Fix so type attribute on script tags is not used on HTML5 pages (#6975)
 
 RELEASE 1.4.1
 -------------

plugins/enigma/skins/larry/templates/keys.html

@@ -82,7 +82,7 @@
 
 <roundcube:include file="/includes/footer.html" />
 
-<script type="text/javascript">
+<script>
     new rcube_splitter({ id:'enigmakeyssplitter', p1:'#enigmakeyslist', p2:'#enigmacontent-box',
             orientation:'v', relative:true, start:266, min:180, size:12 }).init();
 </script>

plugins/jqueryui/jqueryui.php

@@ -115,7 +115,7 @@ class jqueryui extends rcube_plugin
         $config_str   = rcube_output::json_serialize($config);
 
         $rcube->output->include_css('plugins/jqueryui/' . $css);
-        $rcube->output->add_header(html::tag('script', array('type' => 'text/javascript', 'src' => $script)));
+        $rcube->output->include_script($script, 'head', false);
         $rcube->output->add_script('$.fn.miniColors = $.fn.minicolors; $("input.colors").minicolors(' . $config_str . ')', 'docready');
         $rcube->output->set_env('minicolors_config', $config);
     }
@@ -141,7 +141,7 @@ class jqueryui extends rcube_plugin
             $rcube->output->include_css('plugins/jqueryui/' . $css);
         }
 
-        $rcube->output->add_header(html::tag('script', array('type' => "text/javascript", 'src' => $script)));
+        $rcube->output->include_script($script, 'head', false);
     }
 
     /**

plugins/managesieve/skins/larry/templates/managesieve.html

@@ -73,7 +73,7 @@
 
 <roundcube:include file="/includes/footer.html" />
 
-<script type="text/javascript">
+<script>
   <roundcube:if condition="!env:managesieve_no_set_list" />
   new rcube_splitter({ id:'managesievesplitter1', p1:'#filtersetslistbox', p2:'#filtersscreen',
           orientation:'v', relative:true, start:156, min:120, size:12 }).init();

program/include/rcmail_output_html.php

@@ -1790,7 +1790,7 @@ EOF;
     public function add_script($script, $position = 'head')
     {
         if (!isset($this->scripts[$position])) {
-            $this->scripts[$position] = "\n" . rtrim($script);
+            $this->scripts[$position] = rtrim($script);
         }
         else {
             $this->scripts[$position] .= "\n" . rtrim($script);
@@ -1852,7 +1852,7 @@ EOF;
 
         // put docready commands into page footer
         if (!empty($this->scripts['docready'])) {
-            $this->add_script('$(function(){ ' . $this->scripts['docready'] . "\n});", 'foot');
+            $this->add_script("\$(function() {\n" . $this->scripts['docready'] . "\n});", 'foot');
         }
 
         $page_header = '';

program/lib/Roundcube/html.php

@@ -256,15 +256,21 @@ class html
         if (is_string($attr)) {
             $attr = array('src' => $attr);
         }
+
         if ($cont) {
-            if (self::$doctype == 'xhtml')
+            if (self::$doctype == 'xhtml') {
-                $cont = "\n/* <![CDATA[ */\n" . $cont . "\n/* ]]> */\n";
+                $cont = "/* <![CDATA[ */\n{$cont}\n/* ]]> */";
-            else
+            }
-                $cont = "\n" . $cont . "\n";
+
+            $cont = "\n{$cont}\n";
+        }
+
+        if (self::$doctype == 'xhtml') {
+            $attr += array('type' => 'text/javascript');
         }
 
-        return self::tag('script', $attr + array('type' => 'text/javascript', 'nl' => true),
+        return self::tag('script', $attr + array('nl' => true), $cont,
-            $cont, array_merge(self::$common_attrib, array('src','type','charset')));
+            array_merge(self::$common_attrib, array('src', 'type', 'charset')));
     }
 
     /**

skins/larry/includes/footer.html

@@ -1,5 +1,5 @@
 <roundcube:object name="message" id="messagestack" condition="env:task != 'login'" />
 
-<script type="text/javascript">
+<script>
 if (!window.UI) { var UI = new rcube_mail_ui(); }
 </script>

skins/larry/includes/header.html

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 var UI = new rcube_mail_ui();
 </script>
 

skins/larry/includes/links.html

@@ -5,7 +5,7 @@
 <roundcube:if condition="in_array(env:task, array('mail','addressbook','settings'))" />
 <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
 <roundcube:endif />
-<script type="text/javascript" src="/ui.js"></script>
+<script src="/ui.js"></script>
 <roundcube:add_label name="errortitle" />
 <roundcube:add_label name="toggleadvancedoptions" />
 <roundcube:add_label name="options" />