adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2771: upgrade jquery from 1.7.2 to 1.8.2 and jquery.ui from 1.8.16 to 1.9.0

Browse Source 
Attention plugins: jquery ui effect script ids change when using combine_script because file names changed ... 

git-svn-id: http://piwigo.org/svn/trunk@18630 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-10-12 20:32:30 +00:00
parent 267c548896
commit 97294dac5a
159 changed files with 9092 additions and 9615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/template.class.php
+11 -11
View File
@@ -542,7 +542,7 @@ class Template {
$crop = 0;
$minw=null;
$minh=null;
if (isset($params['crop']))
{
if (is_bool($params['crop']))
@@ -936,7 +936,7 @@ class ScriptLoader
'core.scripts' => 'themes/default/js/scripts.js',
'jquery' => 'themes/default/js/jquery.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',
'jquery.ui.effect' => 'themes/default/js/ui/minified/jquery.ui.effect.min.js',
);
private static $ui_core_dependencies = array(
@@ -1153,7 +1153,14 @@ class ScriptLoader
{
$required_ids = array('jquery');
if ( strncmp($id, 'jquery.ui.', 10)==0 )
if ( strncmp($id, 'jquery.ui.effect-', 17)==0 )
{
$required_ids = array('jquery', 'jquery.ui.effect');
if ( empty($script->path) )
$script->path = dirname(self::$known_paths['jquery.ui.effect'])."/$id.min.js";
}
elseif ( 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));
@@ -1161,13 +1168,6 @@ class ScriptLoader
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.effects'])."/$id.min.js";
}
foreach ($required_ids as $required_id)
{
@@ -1179,7 +1179,7 @@ class ScriptLoader
private function load_known_required_script($id, $load_mode)
{
if ( isset(self::$known_paths[$id]) or strncmp($id, 'jquery.ui.', 10)==0 or strncmp($id, 'jquery.effects.', 15)==0 )
if ( isset(self::$known_paths[$id]) or strncmp($id, 'jquery.ui.', 10)==0 )
{
$this->add($id, $load_mode, array(), null);
return true;