Changeset 18925

Timestamp:

Nov 4, 2012, 12:03:50 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (fix windowheigh...)

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (14 diffs)
• js/Affiche_script.js (modified) (8 diffs)
• main.inc.php (modified) (2 diffs)

extensions/Autosize/autosize.inc.php

@@ -58 +58 @@
  echo "GET:"  . cl_print_var($_GET) ;
  echo "POST:"  . cl_print_var($_POST) ;
- die();
+ die("#60:" . $DEBUG_autosize);
  }
     $ma_page=isset($page['body_id'])?$page['body_id']:"" ;  
@@ -74 +74 @@
     if(!isset($_COOKIE['windowHeight'] )){
        self::reload();
-       die();
+       die("#76" . $DEBUG_autosize);
     }
 
@@ -80 +80 @@
    if (!isset($_COOKIE['autosize_reload'])  ){  
            self::reload();
-            die();
+            die("#82 :" + $DEBUG_autosize);
 
     }  
@@ -138 +138 @@
 //=======================================================================
 $pictureSelType = pwg_get_session_var('picture_sel_type',$pictureSelType);  
-
+ 
  if(preg_match("|test|", $DEBUG_autosize, $val)) { 
     echo $infos_message ;
@@ -145 +145 @@
         echo "GET:"  . cl_print_var($_GET) ;
         echo "POST:"  . cl_print_var($_POST) ;
-        die();
+        die("#147: ".$DEBUG_autosize);
  }
  
@@ -183 +183 @@
        $theImageHeight=   $windowHeight - $theImageTop  - $theImageMargeHeight ;
  
-   if ($element_info['is_gvideo']){
+   if (isset($element_info['is_gvideo']) && $element_info['is_gvideo'] ){
     $pictureDeriv=$default_size;
 
@@ -228 +228 @@
          if(preg_match("|c1|", $DEBUG_autosize, $val)) {
          echo "<!-- " . $theImageWidth . "x" . $theImageHeight . " " .cl_print_var($content) ." -->";
-         die();
+         die("#230: " . $DEBUG_autosize);
     }
       return  $content;
@@ -315 +315 @@
  
  
- die($content);
+ die("#317 : " . $content + $DEBUG_autosize);
  $theImageHeight =abs($theImageHeight);
  $theImageWidth =abs($theImageWidth);
@@ -444 +444 @@
     );
    if( preg_match("|c2|", $DEBUG_autosize, $val) ){ 
-   die();
+   die( "446: " . $DEBUG_autosize);
    return $content ;
 
@@ -588 +588 @@
       }  
      if($pictureSelType == $pictureDeriv ) {
-        return ;
+         if(preg_match("|event|", $DEBUG_autosize, $val)) {  cl_aff_infos_plus();} ;
+     //   return ;
      } 
         $template->set_filenames(array('autosize_content_header'=> $file )); 
@@ -847 +848 @@
     $std_image  = (object) '';
     $default_image=(object) '';
+    $SelType_image=(object) '';
     $last_image=(object) '';
 
@@ -877 +879 @@
             }          
              if(preg_match("|get_minfos|", $DEBUG_autosize, $val)) 
-            $infos_message .=$img_url . " -> " . $img_type ."<br >";
+                      $infos_message .=$img_url . " -> " . $img_type ."<br >";
 
           if(file_exists(PHPWG_ROOT_PATH.$img_url)){    } // if file        
@@ -903 +905 @@
                             $mini_image=  $img_select;  
                           }
-
                     $liste_type[$img_type]=$img_type.",".$img_url.",".$imgWH[0] .",".$imgWH[1] ;
+                    if( $img_type==$pictureSelType){
+                     if(preg_match("|get_minfos|", $DEBUG_autosize, $val))     $infos_message .= $pictureSelType . " <--> " . $img_type ."<br >";
+
+                          $SelType_image->type=$img_type;
+                          $SelType_image->url=$img_url;
+                          $SelType_image=$img_select;    
+                    }
                     if( $img_type=="Original" && $theImage_def==0 ){ 
                           $theImage_def=1;
@@ -948 +956 @@
   
           $retour=(object)'' ;
-
-
-          
-
       if ($pictureSelType=="Autosize") $retour= $maxi_image ;
       else if ($pictureSelType=="SelMaxi") $retour= $mini_image ;
-
-      else  $retour=$last_image ;
-        if (!isset( $retour->type)){
-              $retour=$last_image;
-              $retour->type =  $retour->get_type();
-              $retour->url  =  $retour->get_path();
-            }
-    
-      if($nofile > 0){      
-
-                      $set_miniature=$No_files ;
-                   
-      
-          
+      else{     
+      $types = array_intersect(array_keys($liste_type), array($pictureSelType));
+      if(!count($types)){
+        $pictureSelType="Original";
       }
-     
-    
-      if($retour->type=="Original")
-        $retour->type=$last_derivative ;
+        $retours=  explode(",",$liste_type[$pictureSelType]);
+        $retour=$SelType_image;
+        $retour->type=$retours[0];
+        $retour->url=$retours[1];
+     }
+  
+
+  if (!isset( $retour->type)){     
+                  $retour=$last_image;
+                  $retour->type =  $retour->get_type();
+                  $retour->url  =  $retour->get_path();
+}
+if (isset( $retour->type) && $retour->type=="Original" ){     
+                  $retour=$last_image;
+                  $retour->type =  $last_derivative;
+                  $retour->url  =  $retour->get_path();
+}
+
+         if(preg_match("|get_minfos|", $DEBUG_autosize, $val))     $infos_message .= $pictureSelType . " -> " .  $retour->type . "---" . $retour->url. "<br >";
+
+      if($nofile > 0){  
+        $set_miniature=$No_files ;
+      }
+
 
     if(preg_match("|get_minfos|", $DEBUG_autosize, $val)) 

extensions/Autosize/js/Affiche_script.js

@@ -630 +630 @@
          .error(function (e) {
            if (!this.complete) {
-             src = jQuery(this).attr("src").replace("./_data/i/","",1);
+             src = jQuery(this).attr("src").replace("./_data/i/", "", 1);
              jQuery.ajax({
                type: 'GET',
-               url: 'i.php?' +  src + "&ajaxload=true",
+               url: 'i.php?' + src + "&ajaxload=true",
                dataType: 'json',
                success: (function (data) {
@@ -641 +641 @@
              });
 
-          
+
 
            }
@@ -648 +648 @@
          .bind("Finish", function (e, data) {
            if (typeof imageInfos_id == "undefined") return;
-          
+
          })
           .bind("ON", function (e, data) {
@@ -660 +660 @@
               return;
             }
-            if (data.src) { 
-             if (typeof imageInfos_id == "undefined") return;
-              if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {              
-             //   Autosize_resize(true, options);
+            if (data.src) {
+              if (typeof imageInfos_id == "undefined") return;
+              if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
+                //   Autosize_resize(true, options);
               }
             }
@@ -965 +965 @@
         //jQuery(theMainImage_id).height(Zone_image.image.height);
       } else {
-      if (options.imageAutosize==false)
-        if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
-          jQuery(theMainImage_id).height(Zone_image.image.height);
-          jQuery(theMainImage_id).width(Zone_image.image.width);
-
-        } else {
-          jQuery(theMainImage_id).height(Zone_image.image.height);
-          jQuery(theMainImage_id).width(Zone_image.image.width);
-        }
+        if (options.imageAutosize == false)
+          if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
+            jQuery(theMainImage_id).height(Zone_image.image.height);
+            jQuery(theMainImage_id).width(Zone_image.image.width);
+
+          } else {
+            jQuery(theMainImage_id).height(Zone_image.image.height);
+            jQuery(theMainImage_id).width(Zone_image.image.width);
+          }
 
 
@@ -1009 +1009 @@
         url2 = this.src;
         jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
-        type = options.pictureSelType;
+        newtype = options.pictureSelType;
         if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
 
@@ -1021 +1021 @@
         options.pictureMap = typeMap;
         options.pictureDeriv = typeSave;
-
-
         document.cookie = 'picture_deriv=' + typeSave + ';path=' + COOKIE_PATH;
         Autosize_resize(true, options);
+        if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
+
+        } else {
+          jQuery("#bp_img_cla").attr("src", "./plugins/Autosize/icons/button-maximize.png");
+          jQuery("#bp_cla span").text("");
+        }
       })
       .live("ON", function (e) {
@@ -2196 +2200 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         // ready
 
 

extensions/Autosize/main.inc.php

@@ -46 +46 @@
 }
 if(!preg_match("|NO|", $DEBUG_autosize, $val)) {  
-
 // init cl_autosize_script_1 cl_autosize_affiche 
 //Important avant pamooramics, gvideo
-
 add_event_handler('render_element_content', array(&$autosize_ctrl, 'autosize_calcContent'),EVENT_HANDLER_PRIORITY_NEUTRAL-11,2); 
-
 /**/
 add_event_handler('render_element_content',  array(&$autosize_ctrl,'init'),EVENT_HANDLER_PRIORITY_NEUTRAL-1,2  );
@@ -62 +59 @@
 } ;
 
-
-
+     
+       
 
 ?>