Changeset 18630 for trunk/include/template.class.php

Timestamp:

Oct 12, 2012, 10:32:30 PM (12 years ago)

Author:

rvelices

Message:

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 ...

File:

• trunk/include/template.class.php (modified) (5 diffs)

trunk/include/template.class.php

@@ -543 +543 @@
     $minw=null;
     $minh=null;
-    
+
     if (isset($params['crop']))
     {
@@ -937 +937 @@
       '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',
     );
 
@@ -1154 +1154 @@
       $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]) )
@@ -1162 +1169 @@
           $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)
@@ -1180 +1180 @@
   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);