lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: optimize code

Browse Source
This commit is contained in:
Regis Houssin 2011-10-31 11:01:26 +01:00
parent 48f4e2d735
commit 338b4375d6
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/main.inc.php
View File

@ -845,7 +845,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
else print "<title>".$appli."</title>";
print "\n";
if (! defined('DISABLE_JQUERY'))
if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
{
print '<!-- Includes for JQuery (Ajax library) -->'."\n";
$jquerytheme = 'smoothness';
@ -976,32 +976,33 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/ColVis/js/ColVis.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/js/TableTools.min'.$ext.'"></script>'."\n";
}
// Global js function
print '<!-- Includes JS of Dolibarr -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js"></script>'."\n";
// Add datepicker default options
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
// Output module javascript
if (is_array($arrayofjs))
{
print '<!-- Includes JS specific to page -->'."\n";
foreach($arrayofjs as $jsfile)
{
if (preg_match('/^http/i',$jsfile))
{
print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
}
else
{
if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile; // For backward compatibility
print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
}
}
}
}
// Output module javascript
if (is_array($arrayofjs))
{
print '<!-- Includes JS specific to page -->'."\n";
foreach($arrayofjs as $jsfile)
{
if (preg_match('/^http/i',$jsfile))
{
print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
}
else
{
if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile; // For backward compatibility
print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
}
}
}
// Add datepicker default options
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
if (! empty($head)) print $head."\n";
if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";