bug:2268 combine_script - sometimes precedent scripts were not being loaded before ...

in admin, the accordion is loaded in the header (admin pages have the same header combined script, but usually different bottom scripts)

git-svn-id: http://piwigo.org/svn/branches/2.2@10504 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2011-04-19 20:09:19 +00:00
parent 178599659b
commit fe593bc2c8
2 changed files with 3 additions and 2 deletions

View File

@@ -1,3 +1,4 @@
{combine_script id='jquery.ui.accordion' load='header'}{*we load in the header because the accordion is on every admin page and usually all admin pages use the same header combined script but not the same footer script*}
{footer_script require='jquery.ui.accordion'}
jQuery(document).ready(function(){ldelim}
jQuery('#menubar').accordion({ldelim}

View File

@@ -1101,8 +1101,8 @@ class ScriptLoader
foreach( $scripts as $id => $script)
{
$load = $script->load_mode;
if ($load==0)
continue;
/*if ($load==0)
continue;*/
foreach( $script->precedents as $precedent)
{
if ( !isset($scripts[$precedent] ) )