remove redundant type attrib in script tag

pull/6977/head
PhilW 5 years ago
parent 8bcb1e801c
commit 32775f0e43

@ -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>

@ -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);
}
/**

@ -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();

@ -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')));
}
/**

@ -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>

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

@ -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" />

Loading…
Cancel
Save