Changeset 7013 for extensions

Timestamp:

Sep 24, 2010, 6:15:20 PM (14 years ago)

Author:

cljosse

Message:

[Autosize]Improvement 'panoramas' compatibility

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (5 diffs)
• main.inc.php (modified) (4 diffs)

extensions/Autosize/js/Affiche_script.js

@@ -1 @@
-
+
 //==== remplace $(... avec jQuery( ====
  var ov_map;
@@ -8 +8 @@
      new_element = jQuery(element);
      jq = new_element.selector;
-     
+     if (jQuery("#Panorama").length) {
+
+         return new_element;
+     }
      afq = jQuery(document).data("initialized") ; //2
      if (element == window && afq != 1)
@@ -33 +36 @@
             }else if( MooTools.version == "1.11") {
             B = element;
-            if (!B) {
-                if (typeof (B) == "boolean") return null;
-                return jQuery(); 
-            }
+                if (!B) { 
+                        if (typeof (B) == "boolean") return null;
+                        return jQuery(); 
+                 }
                 if (B.htmlElement) {
                     return Garbage.collect(B);
 
                 }
-                if ([window, document].contains(B)) { 
-                return B; 
-                }
+                if ([window, document].contains(B)) { return B; }
                 var A = $type(B);
                 if (A == "string") { B = document.getElementById(B); A = (B) ? "element" : false; }
@@ -123 +124 @@
 
             Type_Img = "pamoorama";
+        } else if (jQuery("#Panorama").length) {
+
+            Type_Img = "panorama";
+            return;
         } else if (jQuery("#theImage").find("img").length > 0) {
             Type_Img = "img";
@@ -356 +361 @@
 
             } else if (theme.match(RegExp("luciano", "g"))) {
-                jQuery("#theImage").height(Image_height );
+                jQuery("#theImage").height(Image_height);
             }
         } catch (e) {

extensions/Autosize/main.inc.php

@@ -23 +23 @@
     global $infos_message,$erreur_message;
     global  $conf,$lang ,$user;
-
     if ( $page['body_id']=='thePicturePage'  ) {
    if ( isset($picture['current'])){
@@ -29 +28 @@
     $autosize_parametres = cl_autosize_Get_Options();
     include (AUTOSIZE_PATH."include/affiche.php");              
- 
+
     $template->set_filenames(
         array('autosize_content'=> $my_path.'template/autosize.tpl')
@@ -146 +145 @@
  }
  //=======================================================================
-//add_event_handler('loc_end_page_header','cl_autosize_script',40 );    
-function cl_autosize_script()
+//add_event_handler('render_element_content', 'cl_autosize_script', 98, 2 );
+
+function cl_autosize_script($content, $image)
 {
    global $user, $picture, $template,$page;
-    global $content, $element_info;   
+  
+    global  $element_info;   
     global $infos_message,$erreur_message;
     global  $conf,$lang ,$user;
 
     $my_path = dirname(__FILE__).'/';
-        
- 
     $template->set_filenames(
-        array('autosize_cl_content'=> $my_path.'template/cl_conflit.tpl')
+        array('autosize_cl_init'=> $my_path.'template/cl_conflit.tpl')
     );
-
         $template->assign(
                                         array(
@@ -166 +164 @@
                                         )
                      );
-       return $template->parse( 'autosize_cl_content', false);
+       return  $content;
        
 }