diff options
| -rw-r--r-- | plugins/enigma/skins/larry/templates/keys.html | 2 | ||||
| -rw-r--r-- | plugins/jqueryui/jqueryui.php | 4 | ||||
| -rw-r--r-- | plugins/managesieve/skins/larry/templates/managesieve.html | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/html.php | 7 | ||||
| -rw-r--r-- | skins/larry/includes/footer.html | 2 | ||||
| -rw-r--r-- | skins/larry/includes/header.html | 2 | ||||
| -rw-r--r-- | skins/larry/includes/links.html | 2 |
7 files changed, 12 insertions, 9 deletions
diff --git a/plugins/enigma/skins/larry/templates/keys.html b/plugins/enigma/skins/larry/templates/keys.html index 7a3fd0554..6e2b3f3e5 100644 --- a/plugins/enigma/skins/larry/templates/keys.html +++ b/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> diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index 3a1e7e97d..3e6e3724a 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -111,7 +111,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); } @@ -137,7 +137,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); } /** diff --git a/plugins/managesieve/skins/larry/templates/managesieve.html b/plugins/managesieve/skins/larry/templates/managesieve.html index c0d602ced..d08be47dc 100644 --- a/plugins/managesieve/skins/larry/templates/managesieve.html +++ b/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(); diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index 4f282df4b..af61c68e3 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -263,8 +263,11 @@ class html $cont = "\n" . $cont . "\n"; } - return self::tag('script', $attr + array('type' => 'text/javascript', 'nl' => true), - $cont, array_merge(self::$common_attrib, array('src','type','charset'))); + if (self::$doctype == 'xhtml') + $attr += array('type' => 'text/javascript'); + + return self::tag('script', $attr + array('nl' => true), $cont, + array_merge(self::$common_attrib, array('src','type','charset'))); } /** diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html index f64420d27..3be29f0d1 100644 --- a/skins/larry/includes/footer.html +++ b/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> diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html index 292b3c4be..89a625aa0 100644 --- a/skins/larry/includes/header.html +++ b/skins/larry/includes/header.html @@ -1,4 +1,4 @@ -<script type="text/javascript"> +<script> var UI = new rcube_mail_ui(); </script> diff --git a/skins/larry/includes/links.html b/skins/larry/includes/links.html index d8cd557dc..29ef88e2d 100644 --- a/skins/larry/includes/links.html +++ b/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" /> |