Permalink
Browse files

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/trunk@10503 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
modus75 committed Apr 19, 2011
1 parent 9b0677e commit 13f099f128b1d3af6d37c3e566fae60c38e93971
Showing with 3 additions and 2 deletions.
  1. +1 −0 admin/themes/default/template/admin.tpl
  2. +2 −2 include/template.class.php
@@ -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}
@@ -1101,8 +1101,8 @@ private static function check_load_dep($scripts)
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] ) )

0 comments on commit 13f099f

Please sign in to comment.