aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-10-12 20:32:30 +0000
committerrvelices <rv-github@modusoptimus.com>2012-10-12 20:32:30 +0000
commit97294dac5ac27b43cb6a116d2852578376efa58d (patch)
treea983e1fd5930a65d2c750278c84f768b59cc70c5 /include
parent267c548896d1e16ace40b6c1cb4df5913ac0bfa4 (diff)
feature 2771: upgrade jquery from 1.7.2 to 1.8.2 and jquery.ui from 1.8.16 to 1.9.0
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
Diffstat (limited to '')
-rw-r--r--include/template.class.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/template.class.php b/include/template.class.php
index 6d81b7169..21dfed4ea 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -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,20 +1153,20 @@ class ScriptLoader
{
$required_ids = array('jquery');
- if ( strncmp($id, 'jquery.ui.', 10)==0 )
+ if ( strncmp($id, 'jquery.ui.effect-', 17)==0 )
{
- if ( !isset(self::$ui_core_dependencies[$id]) )
- $required_ids = array_merge(array('jquery', 'jquery.ui'), array_keys(self::$ui_core_dependencies));
+ $required_ids = array('jquery', 'jquery.ui.effect');
if ( empty($script->path) )
- $script->path = dirname(self::$known_paths['jquery.ui'])."/$id.min.js";
+ $script->path = dirname(self::$known_paths['jquery.ui.effect'])."/$id.min.js";
}
- elseif ( strncmp($id, 'jquery.effects.', 15)==0 )
+ elseif ( strncmp($id, 'jquery.ui.', 10)==0 )
{
- $required_ids = array('jquery', 'jquery.effects');
+ 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.effects'])."/$id.min.js";
+ $script->path = dirname(self::$known_paths['jquery.ui'])."/$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;