Keep most possible javascript into head

This commit is contained in:
Laurent Destailleur 2011-02-01 18:37:16 +00:00
parent b2f6eec355
commit 9d364554d9

View File

@ -886,6 +886,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest'.$ext.'"></script>'."\n";
}
// CKEditor
if (! empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor.js"></script>'."\n";
}
}
// Output module javascript
@ -1566,12 +1571,6 @@ if (! function_exists("llxFooter"))
print "\n";
if ($foot) print '<!-- '.$foot.' -->'."\n";
// CKEditor
if (defined('REQUIRE_CKEDITOR'))
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor.js"></script>'."\n";
}
if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";