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

Removed scriptaculous from include. We keep files used for prototype

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-27 23:41:07 +00:00
parent b4024992a8
commit e777d00a5e
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/main.inc.php
View File

@ -728,6 +728,8 @@ else
$heightforframes=48; $heightforframes=48;
// Functions // Functions
@ -838,26 +840,17 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
$mini='';$ext='.js'; $mini='';$ext='.js';
if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $mini='_mini'; $ext='.jgz'; } // mini='_mini', ext='.gz' if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $mini='_mini'; $ext='.jgz'; } // mini='_mini', ext='.gz'
print '<!-- Includes for JQuery (must be before prototype/scriptaculous) -->'."\n"; // JQuery. Must be before other includes (prototype/scriptaculous)
print '<!-- Includes for JQuery -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-1.4.2.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-1.4.2.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-1.8.4.custom.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-1.8.4.custom.min'.$ext.'"></script>'."\n";
// This one is required for all Ajax features // This one is required for lot of Ajax features
if (! defined('DISABLE_PROTOTYPE')) if (! defined('DISABLE_PROTOTYPE'))
{ {
print '<!-- Includes for Prototype (Used by Scriptaculous) -->'."\n"; print '<!-- Includes for Prototype (Used by Scriptaculous) -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype'.$mini.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype'.$mini.$ext.'"></script>'."\n";
} }
// This one is required for boxes
if (! defined('DISABLE_SCRIPTACULOUS'))
{
print '<!-- Includes for Scriptaculous (Used by Drag and Drop) -->'."\n";
//print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n";
//print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js?load=builder,effects,dragdrop,controls,slider,sound"></script>'."\n";
$listofscripts='effects,dragdrop';
if ($conf->global->COMPANY_USE_SEARCH_TO_SELECT) $listofscripts.=',controls'; // For Ajax.Autocompleter
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js?load='.$listofscripts.'"></script>'."\n";
}
} }
// Output module javascript // Output module javascript