archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update jQuery UI to 1.8.10.

Browse source 
Improve jquery ui management in template class.

git-svn-id: http://piwigo.org/svn/trunk@9559 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-03-07 00:58:34 +00:00
commit ac0ba26afc
94 changed files with 285 additions and 13547 deletions
Download patch file Download diff file Expand all files Collapse all files

42
include/template.class.php
View file

@ -902,7 +902,14 @@ class ScriptLoader
private static $known_paths = array(
'core.scripts' => 'themes/default/js/scripts.js',
'jquery' => 'themes/default/js/jquery.min.js',
'jquery.ui' => 'themes/default/js/jquery.ui.min.js'
'jquery.ui' => 'themes/default/js/ui/minified/jquery.ui.core.min.js',
'jquery.effects' => 'themes/default/js/ui/minified/jquery.effects.core.min.js',
);
private static $ui_core_dependencies = array(
'jquery.ui.widget' => array('jquery'),
'jquery.ui.position' => array('jquery'),
'jquery.ui.mouse' => array('jquery', 'jquery.ui', 'jquery.ui.widget'),
);
function __construct()
@ -961,6 +968,12 @@ class ScriptLoader
if ($load_mode < $script->load_mode)
$script->load_mode = $load_mode;
}
// Load or modify all UI core files
if ($id == 'jquery.ui' and $script->path == self::$known_paths['jquery.ui'])
{
foreach (self::$ui_core_dependencies as $script_id => $required_ids)
$this->add($script_id, $load_mode, $required_ids, null, $version);
}
}
function did_head()
@ -1085,10 +1098,29 @@ class ScriptLoader
}
if ( strncmp($id, 'jquery.', 7)==0 )
{
if ( !in_array('jquery', $script->precedents ) )
$script->precedents[] = 'jquery';
if ( strncmp($id, 'jquery.ui.', 10)==0 && !in_array('jquery.ui', $script->precedents ) )
$script->precedents[] = 'jquery.ui';
$required_ids = array('jquery');
if ( strncmp($id, 'jquery.ui.', 10)==0 )
{
if ( !isset(self::$ui_core_dependencies[$id]) )
$required_ids = array_merge(array('jquery', 'jquery.ui'), array_keys(self::$ui_core_dependencies));
if ( empty($script->path) )
$script->path = dirname(self::$known_paths['jquery.ui'])."/$id.min.js";
}
elseif ( strncmp($id, 'jquery.effects.', 15)==0 )
{
$required_ids = array('jquery', 'jquery.effects');
if ( empty($script->path) )
$script->path = dirname(self::$known_paths['jquery.ui'])."/$id.min.js";
}
foreach ($required_ids as $required_id)
{
if ( !in_array($required_id, $script->precedents ) )
$script->precedents[] = $required_id;
}
}
}