Changeset 18735

Timestamp:

Oct 25, 2012, 3:24:09 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (option marge bottom)

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (24 diffs)
• include/affiche.php (modified) (2 diffs)
• js/Affiche_script.js (modified) (20 diffs)
• js/autosizeDetect.js (modified) (1 diff)
• js/autosize_ajax.js (modified) (5 diffs)
• template/autosize.tpl (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -43 +43 @@
     //==============================================================================
   global $DEBUG_autosize;
-    $DEBUG_autosize = isset($_POST['cl_debug']) ? $_POST['cl_debug'] : "false" ;
+    $DEBUG_autosize = isset($_POST['cl_debug']) ? $_POST['cl_debug'] : "" ;
     $DEBUG_autosize = isset($_GET['cl_debug']) ? $_GET['cl_debug'] :  $DEBUG_autosize ;
-    $DEBUG_autosize = isset($conf['cl_debug']) ? $conf['cl_debug'] : $DEBUG_autosize ;
+    $DEBUG_autosize = isset($conf['cl_debug']) ? $conf['cl_debug']."," . $DEBUG_autosize : $DEBUG_autosize ;
  //===============================================================
+
+
     $ma_page=isset($page['body_id'])?$page['body_id']:"" ;  
    if ($ma_page !='thePicturePage') return ; 
@@ -95 +97 @@
   global  $has_pamoorama,$pictureSelType,$pictureDeriv;
   global $infos_message,$warnings_message;
+
+  global $set_miniature,$imgSizeWH,$DEBUG_autosize; 
+  global $theImageHeight,$theImageWidth,$theImageLeft,$theImageTop,$windowWidth,$windowHeight,$theMainImageSize;
 //=======================================================  
 global $has_pamoorama ;
@@ -124 +129 @@
   $current = $template->get_template_vars('current'); 
 
-   global $set_miniature,$imgSizeWH,$DEBUG_autosize; 
-   global $theImageHeight,$theImageWidth,$theMainImageWidth;
+
    //=== Zone affichage ==
       $theImageTop= isset($_COOKIE['theImageTop'])?$_COOKIE['theImageTop']:0;
@@ -132 +136 @@
        $theImageRight=isset($_COOKIE['theImageRight'])?$_COOKIE['theImageRight']:0;
        $theImageBottom=isset($_COOKIE['theImageBottom'])?$_COOKIE['theImageBottom']:0;
-
-       $windowWidth=$_COOKIE['windowWidth'];
-       $windowHeight=$_COOKIE['windowHeight'];
+       $windowWidth=$_COOKIE['windowWidth'] ;
+       $windowHeight=$_COOKIE['windowHeight'] ;
 
        $theImageMargeWidth=isset($_COOKIE['theImageMargeWidth']) ? $_COOKIE['theImageMargeWidth']:0;
@@ -141 +144 @@
        $theImageWidth=    $windowWidth -  $theImageRight - $theImageLeft - $theImageMargeWidth;
        $theImageHeight=   $windowHeight - $theImageTop - $theImageBottom - $theImageMargeHeight;
-       $theImageWidth=isset($_COOKIE['theImageWidth']) ? $_COOKIE['theImageWidth']:$theImageWidth;
-       $theImageHeight=isset($_COOKIE['theImageHeight'])?$_COOKIE['theImageHeight']:$theImageHeight;
-
-    $retour=  autosize_controler::get_min_max() ; 
-
+  
+
+    $retour = autosize_controler::get_min_max() ; 
+    $theMainImageSize = $retour->get_size();
   if($theImageHeight!=0 && $theImageWidth!=0){
       $pictureDeriv=$retour->type ;
@@ -151 +153 @@
       $pictureDeriv=$default_size;
    }
-  
 //============================================================
   pwg_set_session_var('picture_deriv',$pictureDeriv);
@@ -170 +171 @@
 $_COOKIE['picture_deriv']=$pictureDeriv;
 
-
  $pattern = array();
   if($has_pamoorama=="true"){ 
-  if($DEBUG_autosize == "c1") echo  $theImageWidth . "x" . $theImageHeight ;
+  if(preg_match("|c1|", $DEBUG_autosize, $val)) echo  $theImageWidth . "x" . $theImageHeight ;
       $pattern[0] = '/width\:(.*)(\d+),/';$replacement[0] = 'width:  '.$theImageWidth.' ,';  
       if(($theImageWidth!=0)){      
             $content=  preg_replace($pattern, $replacement, $content);
         }
-         if($DEBUG_autosize == "c1") {
+         if(preg_match("|c1|", $DEBUG_autosize, $val)) {
          echo "<!-- " . $theImageWidth . "x" . $theImageHeight . " " .cl_print_var($content) ." -->";
          die();
@@ -204 +204 @@
 return  $content;
  }
-
  $content=  preg_replace($pattern, "", $content);
+
   return  $content;
 }//INIT
@@ -222 +222 @@
 //===================================================================== 
   global  $has_pamoorama,$pictureSelType,$pictureDeriv;
-  global $theImageHeight,$theImageWidth;
- global $DEBUG_autosize;
+  
+  global $DEBUG_autosize;
+   global $theImageHeight,$theImageWidth,$theImageLeft,$theImageTop,$windowWidth,$windowHeight,$theMainImageSize;
+
+
   //-- si Autosize correction redim ---------------
   $current = $template->get_template_vars('current'); 
@@ -229 +232 @@
   
 //  if( $has_pamoorama=="true") return $content ;
- // if($pictureSelType!="Autosize") return $content ;
-
-  $pattern = '/width=\"(\d+)\"/';
-$replacement = '';
+//  if($pictureSelType!="Autosize") return $content ;
+
+$pattern =Array('/width=\"(\d+)\"/','/height=\"(\d+)\"/');
+ 
+
+$replacement = Array('',"style='height:".$theImageHeight."px'");
 $content= preg_replace($pattern, $replacement, $content);
 
-$pattern = '/height=\"(\d+)\"/';
-$replacement = '';
-$content=  preg_replace($pattern, "", $content) ;
-
 if( $has_pamoorama=="true") return $content ;
 
-if($DEBUG_autosize != "c1") return $content ;
- $content=  preg_replace($pattern, "", $content) . $pictureDeriv . " " .$pictureSelType;
+if( !preg_match("|c1|", $DEBUG_autosize, $val) ) return $content ;
+
+ $theMainImageWidth=   $_COOKIE['theMainImageWidth'] ;
+ $theMainImageHeight=   $_COOKIE['theMainImageHeight'] ;
+
+   echo "theMainImageWidth :" . $theMainImageWidth . " X " . $theMainImageHeight . "<br >";
+   echo "theImageWidth :" . $theImageWidth . " X " . $theImageHeight . "<br >";
+   echo "theMainImageSize :" . $theMainImageSize[0]." > ".  $theMainImageSize[1] ."<br />";
+   
+   $Ratio = $theMainImageSize[0]/$theMainImageSize[1];
+
+   $nh = intval($theImageWidth / $Ratio)  ;
+   $nw = intval($theImageHeight * $Ratio) ;
+
+   echo $nw . "x " . $nh ."<br />";
+
+if($theMainImageSize[0] < $nw){
+     echo "HEIGHT " .$theImageHeight . "  WIDTH " .  $nw."<br />";
+}
+if($theMainImageSize[1] <  $nh ){
+ echo "HEIGHT " . $nh  . "  WIDTH " .  ($theImageWidth)."<br />";
+}
+
+ $content=  $content . $pictureDeriv . " " .$pictureSelType;
+        echo "<div style='color:white;position:absolute;left:0;top:0;width:".$windowWidth ."px;height:" .$windowHeight."px;background-color:blue'>";
+         echo "left:".$theImageLeft."px;top:".$theImageTop."px;width:".$theImageWidth ."px;height:" .$theImageHeight."px;";
+        echo "<div style='position:absolute;left:".$theImageLeft."px;top:".$theImageTop."px;width:".$theImageWidth ."px;height:" .  $theImageHeight."px;background-color:green;'>";
+ 
+ 
  die($content);
-  
-
  $theImageHeight =abs($theImageHeight);
  $theImageWidth =abs($theImageWidth);
@@ -323 +349 @@
  *************************/
  static public function cl_autosize_script_1(){
-  global $user,$page,$template,$cl_plugin;
+  global $user,$page,$template,$cl_plugin,$cl_version;
     global  $has_pamoorama,$css_slideshow;  
     global $pictureSelType,$pictureDeriv,$infos_message,$conf;
     global $DEBUG_autosize;
-
+ 
     $ma_page=isset($page['body_id'])?$page['body_id']:"" ;  
     if ($ma_page !='thePicturePage') return ; 
@@ -362 +388 @@
           'autosize_parametres' => $autosize_parametres ,
           'cl_plugins' => $cl_plugin ,
-          'cl_version' => $cl_plugin['version'] ,
+          'cl_version' => $cl_version ,
           'name' => $cl_plugin['name'] ,
           'has_pamoorama' => $has_pamoorama,                                                             
@@ -373 +399 @@
          )
     );
-   
+   if( preg_match("|c2|", $DEBUG_autosize, $val) ){ 
+   die();
+   return $content ;
+
+   }
  
     return $template->parse( 'autosize_init', false);
@@ -386 +416 @@
  {  global $css_slideshow;
    global $pictureSelType,$pictureDeriv,$infos_message;
-           global  $template,$user,$conf,$picture ,$page, $cl_plugin,$known_script ;
-     global  $template,$user,$conf,$picture ,$page, $cl_plugin ;
+           global  $template,$user,$conf,$picture ,$page, $cl_plugin,$cl_version,$known_script ;
+ 
      global  $has_pamoorama; 
      global $DEBUG_autosize;
@@ -404 +434 @@
                         $template->assign(
                                         array(
-                                        'cl_version' => $cl_plugin['version'] ,
+                                        'cl_version' => $cl_version ,
                                         'name' => $cl_plugin['name'] ,
                                         'ma_page' =>    $ma_page,
@@ -430 +460 @@
  static public function cl_autosize_script_3() {
     global  $has_pamoorama,$template,$page,$infos_message;
+     global $DEBUG_autosize;
+
 $ma_page=isset($page['body_id'])?$page['body_id']:"" ;
 if ($ma_page !='thePicturePage') return ;  
@@ -464 +496 @@
 *************************/      
         static public function cl_autosize_affiche(){
+
 
   if (!defined('AUTOSIZE_PATH')) {
@@ -484 +517 @@
 if ($ma_page !='thePicturePage') return ;  
  
+
+
     if(isset($set_miniature)){
         
@@ -495 +530 @@
                 load_language('plugin.lang', AUTOSIZE_PATH);
                 include_once (AUTOSIZE_PATH."include/affiche.php");      
-     if($pictureSelType== $pictureDeriv ) return ;
-             $file =AUTOSIZE_PATH_ABS.'template/picture_1.tpl' ;
-         if ($css_display=="none"  &&  $has_pamoorama=="true" ) {   
+   
+
+     $file =AUTOSIZE_PATH_ABS.'template/picture_1.tpl' ;
+     if ($css_display=="none"  &&  $has_pamoorama=="true" ) {   
             $css_display="block" ;
          }
          $file_css=AUTOSIZE_PATH."css/".$theme.".css";
          if (!file_exists($file_css))  $file_css="no";      
-
+     if ($css_display=="none" ) {       
+        return ;
+      }  
+     if($pictureSelType == $pictureDeriv ) {
+        return ;
+     } 
         $template->set_filenames(array('autosize_content_header'=> $file )); 
         $template->assign(      array( AUTOSIZE_PATH,$AUTOSIZE_PATH,
@@ -510 +551 @@
                           ));
         $template->concat('autosize_content', $template->parse('autosize_content_header', true)); 
-     if ($css_display=="none" ) {       
-        return ;
-      }  
-     
+
         $file =AUTOSIZE_PATH_ABS.'template/header.tpl' ;
         $template->set_filenames(array('autosize_init_header'=> $file ));
@@ -687 +725 @@
       $ret =   file_get_contents ($mycssfile);
 
-function remove_comments( & $string ) { 
-   $string = preg_replace('#/\*.*?\*/#s',"",$string); 
-   return $string;
- }
-
-$order   = array("\r\n", "\n", "\r"," ");
-$replace = '';
-$newstr = str_replace($order, $replace, $ret); 
-
-$order   = array('"');
-$replace = "'";
-$newstr = str_replace($order, $replace, $newstr); 
-
-
-$order   = array("}");
-$replace = '}\r\n';
-$newstr = str_replace($order, $replace, $newstr);
-remove_comments($newstr);
-
-$newstr = explode('\r\n',$newstr);
-$css=Array();
+    function remove_comments( & $string ) { 
+       $string = preg_replace('#/\*.*?\*/#s',"",$string); 
+       return $string;
+     }
+
+    $order   = array("\r\n", "\n", "\r"," ");
+    $replace = '';
+    $newstr = str_replace($order, $replace, $ret); 
+
+    $order   = array('"');
+    $replace = "'";
+    $newstr = str_replace($order, $replace, $newstr); 
+
+
+    $order   = array("}");
+    $replace = '}\r\n';
+    $newstr = str_replace($order, $replace, $newstr);
+    remove_comments($newstr);
+
+    $newstr = explode('\r\n',$newstr);
+    $css=Array();
     
   foreach ($newstr as $key => $value) {    
@@ -883 +921 @@
  //=== verification fichiers absents ===
  global $infos_message,$error_message;
+    global $theImageHeight,$theImageWidth,$theImageLeft,$theImageTop,$windowWidth,$windowHeight,$theMainImageSize;
+
   $ok=false ;
  $nofiles=array();
@@ -897 +937 @@
       if(count($file_id) ==1){
           $file_id[]=$file_id[0] ;
-      }else{
-       
-
-      }
-      
+      }   
         if ( !preg_match("|".$file_id[1]."|", $listes) ){
-
               $listes  .=  $file_id[1] ."<br />";
               $file_no->url= $file_id[1] ;          
@@ -909 +944 @@
               $file_no->id=$id ;
               $file_no->type=$img_type ;  
-              array_push($nofiles,serialize($file_no)) ; 
-
-             
+              array_push($nofiles,serialize($file_no)) ;              
       }
-
       $ok=false ;     
     }
-  }  
-
-$exec_miniatures="";
-$infos_message .= $infos_message;
-
+  }
+  $exec_miniatures="";
   if(count($nofiles)>0){
   //=======================================================================================
     if($nosrc!=true  ){
-         $exec_miniatures = "<script type='text/javascript' src='".PHPWG_ROOT_PATH."themes/default/js/plugins/jquery.ajaxmanager.js'        ></script>";      
+      $exec_miniatures = "<script type='text/javascript' src='".PHPWG_ROOT_PATH."themes/default/js/plugins/jquery.ajaxmanager.js' ></script>";      
         $exec_miniatures .= "<script type='text/javascript' src='".PHPWG_ROOT_PATH."plugins/Autosize/js/autosize_ajax.js' id='autosize_ajax' >  </script >";
         $nosrc=true ;
-    } 
-
- 
-    $exec_miniatures .= "<script type='text/javascript'>
+    }  
+      $exec_miniatures .= "<script type='text/javascript'>
         var nofile=Array(";
         for ($i=0;$i < count($nofiles);$i++){        
              $file=unserialize($nofiles[$i]);
-             $exec_miniatures .=  "{id:'".$file->id."',type:'". $file->type."',file:'". $file->url."'},\n" ;
-          }   
-
-    if($i>0) $exec_miniatures .=  "{id:'".$file->id."',type:'". $file->type."'}" ;
-     $exec_miniatures .=  "); </script>\n" ;                 
-     $exec_miniatures .= "<script type='text/javascript' > 
-      if(typeof nofile!='undefined')
-        getDerivativeUrls(nofile);
+             $exec_miniatures .=  "{id:'".$file->id."',type:'". $file->type."',file:'". $file->url."',width:'".$theMainImageSize[0]."', height:'".$theMainImageSize[1]."'},\n" ;
+          }  
+        if($i>0) $exec_miniatures .=  "{id:'".$file->id."',type:'". $file->type."',file:'". $file->url."',width:'".$theMainImageSize[0]."', height:'".$theMainImageSize[1]."'}" ;
+          $exec_miniatures .=  "); </script>\n" ;                 
+          $exec_miniatures .= "<script type='text/javascript' > 
+          if(typeof nofile!='undefined')
+              getDerivativeUrls(nofile);
       </script>";
- //==================================================================================
- 
-    return $exec_miniatures ;
- } 
-
+      //================================================================================== 
+      return $exec_miniatures ;
+    }
  }
  //==================================================

extensions/Autosize/include/affiche.php

@@ -2 +2 @@
 
 $visible=(isset($visible))?$visible:false; 
+global $cl_version,$cl_plugin;
+
 $cl_version=isset($cl_version)?$cl_version:"";
 $cl_plugin=isset($cl_plugin)?$cl_plugin:"";
+
 $cl_visible=isset($conf['cl_auto']) ? $conf['cl_auto'] : 
 (isset($_GET['cl_visible'])?$_GET['cl_visible']:'true'); 
@@ -94 +97 @@
             'DEBUG_autosize' =>  $DEBUG_autosize   ,
             'cl_visible' =>  $cl_visible,
-            'cl_version' => $cl_version,
+            'cl_version' => $cl_version ,
+            'Version_pwg' => PHPWG_VERSION ,
             'cl_plugin' => $cl_plugin,
 

extensions/Autosize/js/Affiche_script.js

@@ -57 +57 @@
     }
     //____________________ Save_cookies _____________________________
+    /************************************************
+    *
+    *************************************************/
     Get_cookies = function () {
       parametres = {
@@ -76 +79 @@
         theImageBottom: jQuery.cookie('theImageBottom'),
         theImageRight: jQuery.cookie('theImageRight'),
-
         theImageMargeZone: { width: jQuery.cookie('theImageMargeWidth'),
           height: jQuery.cookie('theImageMargeHeight')
@@ -334 +336 @@
       }
 
+      infos_theImage = jQuery(theImage_id).infos(true);                 // conteneur
+
 
       if (test_theme("simple")) {
@@ -339 +343 @@
         theImageAndInfos_id = "#content";
         infos_theImageAndInfos = jQuery(theImageAndInfos_id).infos();  // Cadre general
-        infos_theImage = jQuery(theImage_id).infos(true);                 // conteneur
         infos_theImage.height = infos_window.height - infos_theImage.top;
         //  jQuery(theImage_id).height(infos_theImage.height);
@@ -365 +368 @@
         zheight = infos_window.height - (infos_theImage.top);
       }
-      h01 = 0;
-      h02 = 0;
-      if (options.check_desc_v) {
-
-        infos_comments = jQuery("#comments").infos(true);
-        infos_Licence = jQuery(".licencetag").infos(true);
-        infos_imageComment = jQuery(imageComment_id).infos(true);
-
-        if (infos_imageComment.visible == true && infos_imageComment.general.bottom > infos_theMainImage.bottom) {
-          h02 = infos_imageComment.general.bottom - infos_theMainImage.bottom;
-        }
-        if (infos_Licence.visible == true && infos_Licence.general.bottom > infos_theMainImage.bottom) {
-          h01 = infos_Licence.general.bottom - infos_theMainImage.bottom;
-        }
-        delta_h = infos_imageInfos.bottom - infos_imageInfos.top;
-        info_comments1 = jQuery(theImage_id + " p").infos(true);
-        if (test_theme("simple")) {
-          options.marge_basse += info_comments1.general.height;
-
-        } else {
-          if (test_theme("stripped")) {
-
-          } else
-            options.marge_basse += Math.max(h01, h02);
+
+
+      if (options.check_desc_v) { }
+
+      infos_comments = jQuery("#comments").infos(true);
+      infos_Licence = jQuery(".licencetag").infos(true);
+      infos_imageComment = jQuery(imageComment_id).infos(true);
+
+
+
+      if (test_theme("simple")) {
+
+
+      } else {
+        if (test_theme("stripped")) {
+
+        } else
 
           if (test_theme("blanc , pure, hr_ ")) {
@@ -394 +390 @@
             options.marge_droite += 10;
           }
-        }
-      }
+      }
+
+
       Zone_image = { image_init: {
         width: infos_theMainImage.width,
@@ -597 +594 @@
     **********************/
     jQuery("#theMainImage," + theMainImage_id + ",.preload, .next1 , ")
-        .load(function (e) {         
+        .load(function (e) {
           src = this.src;
           theMainImage_st = true;
@@ -603 +600 @@
             Zone_image = {};
           }
-          Zone_image.image_init = { width: this.width, height: this.height, rapport: this.width / this.height }
-          return;
-          if (typeof theMainImage_id != "undefined")
-            if (!init_img(this)) {
-              nu_img = 0;
+          Zone_image.image_init = { width: this.width, height: this.height, rapport: this.width / this.height };
+          if (!init_img(this)) {
+            nu_img = 0;
+          }
+
+        })
+         .error(function (e) {
+           if (!this.complete) {
+             jQuery(this).hide();
+
+           }
+
+         })
+         .bind("Finish", function (e, data) {
+           if (typeof imageInfos_id == "undefined") return;
+           Autosize_resize(true, options);
+         })
+          .bind("ON", function (e, data) {
+            if (data.status != "ok") {
+              popup = jQuery(".errors");
+              if (popup.length == 0) {
+                jQuery("#theImage").append("<div class='errors'><span></span></div>");
+              }
+              jQuery(".errors").text("Erreur : [" + data.done + "] " + data.responseText);
+              jQuery(".errors").show().delay(20000).hide(2000);
+              return;
             }
-          })
-         .error(function (e) {
-
-         })
-         .bind("Finish", function (e, data) {             
-              if (typeof imageInfos_id == "undefined") return;
-                  Autosize_resize(true, options);
-          })
-          .bind("ON", function (e, data) {
-         if (data.status != "ok") {
-           popup = jQuery(".errors");
-           if (popup.length == 0) {
-             jQuery("#theImage").append("<div class='errors'><span></span></div>");
-           }
-           jQuery(".errors").text("Erreur : [" + data.done + "] " + data.responseText);
-           jQuery(".errors").show().delay(20000).hide(2000);
-           return;
-         }
-         if (data.src) {
-           theImg = document.getElementById(theMainImage_id.replace("#", ""));
-            jQuery("#theMainImage").attr("src", data.src);
-            theImg.src = data.src;
-           if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
-             theImg.src = options.imgSrc;
-
-           }
-         }
-       });
+            if (data.src) {
+              theImg = document.getElementById(theMainImage_id.replace("#", ""));
+              jQuery("#theMainImage").attr("src", data.src);
+              theImg.src = data.src;
+              if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
+                theImg.src = options.imgSrc;
+
+              }
+            }
+          });
 
 
@@ -900 +900 @@
       Save_cookies(options);
       if (options.pictureSelType != "Autosize" && options.pictureSelType != "SelMaxi") {
+        jQuery(theImg).width(Zone_image.image_init.width);
+        jQuery(theImg).height(Zone_image.image_init.height);
         return;
 
@@ -968 +970 @@
       if (url) {
         if (options.imgSrc != url) {
-          url = options.imgSrc;
+          options.imgSrc = url;
         }
       }
@@ -998 +1000 @@
         this.src = this.src;
         // alert(this.src + ' Image does not exist !!');
+      }).error(function (i) {
+        this.src = this.src;
       });
       ;
@@ -1207 +1211 @@
       if (typeof Zone_image == "undefined") Zone_image = { image: {} };
       if (typeof Zone_image.image == "undefined") Zone_image.image = { height: Zone_image.image_init.height, width: Zone_image.image_init.width };
-      theImg.height = img_init.height;
-      theImg.width = img_init.width;
+      // theImg.height = img_init.height;
+      //  theImg.width = img_init.width;
 
       Zone_image.image_init = { height: img_init.height, width: img_init.width, rapport: img_init.rapport };
@@ -1312 +1316 @@
         options.theImageMargeZone = Zone_image.marges;
         if (Type_Img != 'charlie') {
-          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize" && Type_Img != 'pamoorama') {
-            IMg = Get_Maxi(Zone_image.image_init);
+          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize" ) {
+          return ;
           } else {
             IMg = Get_Maxi(Zone_image.image);
@@ -1576 +1580 @@
       retrait_img.height += 2;
 
+
       //===============================================================
       retrait_img.width = Math.ceil(infos_theMainImage.general.marges.width); // borderwidth+padding
@@ -1581 +1586 @@
       retrait_img.width += Math.ceil(options.marges_llgbo || 0);
       retrait_img.width += 2;
-
+      if (!options.check_desc_v)
+        marge_bottom = 0;
 
       //================== Limite Format Image =====================
@@ -1729 +1735 @@
         case "img_autre":
           if (!theMainImage_id) {
-            if (DEBUG_autosize == "true") alert("The_MainImage=null");
+            if (DEBUG_autosize.match("true", gi)) alert("The_MainImage=null");
             return;
 
@@ -1956 +1962 @@
     *********************************************/
     /*
-    if (DEBUG_autosize == "true") {
+    if (DEBUG_autosize.match("true",gi))   {
     for (var i = 0; i < 10; i++) {
     jQuery('#adddebugs').click();
@@ -1999 +2005 @@
 
 
-    if (DEBUG_autosize == "mouse") {
+    if (DEBUG_autosize.match("mouse", "gi")) {
       var mouseLocation = new Point(-500, -500);
       function Point(x, y) {
@@ -2129 +2135 @@
     function Debug_pos() {
       return;
-      if (DEBUG_autosize == "true") {
+      if (DEBUG_autosize.match("true", gi)) {
 
         jQuery("[id ^='Debug']").show();
@@ -2155 +2161 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // ready
 
 

extensions/Autosize/js/autosizeDetect.js

@@ -15 +15 @@
     myHeight = document.body.clientHeight;
   }
-  myWidth =parseInt( myWidth);
-  myHeight = parseInt(myHeight);
+  windowWidth =parseInt( myWidth);
+  windowHeight = parseInt(myHeight);
 
-  jQuery.cookie('windowHeight', myWidth, { path: COOKIE_PATH  });
-  jQuery.cookie('windowWidth', myHeight, { path: COOKIE_PATH });
+  theImageRight = 2;
+  theImageLeft=261;
+  theImageMargeWidth=0;
 
-  jQuery.cookie('theImageHeight', myHeight, { path: COOKIE_PATH });
-  jQuery.cookie('theImageWidth', myWidth, { path: COOKIE_PATH });
+  theImageTop =73;
+  theImageBottom = 0;
+  theImageMargeHeight=0;
+  jQuery.cookie('windowHeight', myHeight, { path: COOKIE_PATH  });
+  jQuery.cookie('windowWidth', myWidth, { path: COOKIE_PATH });
 
-  jQuery.cookie('theImageHeight', theMainImageHeight, { path: COOKIE_PATH });
-  jQuery.cookie('theImageWidth', theMainImageWidth, { path: COOKIE_PATH });
+  jQuery.cookie('theImageRight', theImageRight, { path: COOKIE_PATH  });
+  jQuery.cookie('theImageLeft',theImageLeft, { path: COOKIE_PATH  });
+  jQuery.cookie('theImageMargeWidth',theImageMargeWidth, { path: COOKIE_PATH  });
 
+  jQuery.cookie('theImageTop',theImageTop, { path: COOKIE_PATH  });
+  jQuery.cookie('theImageBottom',theImageBottom, { path: COOKIE_PATH  });
+  jQuery.cookie('theImageMargeHeight', theImageMargeHeight, { path: COOKIE_PATH });
+/*
+  theImageWidth = windowWidth - theImageRight - theImageLeft - theImageMargeWidth;
+  theImageHeight = windowHeight - theImageTop - theImageBottom - theImageMargeHeight;
+  jQuery.cookie('theImageHeight', theImageHeight, { path: COOKIE_PATH });
+  jQuery.cookie('theImageWidth', theImageWidth, { path: COOKIE_PATH });
+  jQuery.cookie('theMainImageHeight', theMainImageHeight, { path: COOKIE_PATH });
+  jQuery.cookie('theMainImage', theMainImageWidth, { path: COOKIE_PATH });
+*/
 
   jQuery.cookie('autosize_reload', "ok", { path: COOKIE_PATH });

extensions/Autosize/js/autosize_ajax.js

@@ -18 +18 @@
   function progress(success,data) {
     if (success) {
-      
+      jQuery("#theMainImage").height(params.height[derivatives.done]);
+      jQuery("#theMainImage").show();
       jQuery("#theMainImage").trigger("ON", [{ nb: derivatives.total - derivatives.done, total: derivatives.total, done: derivatives.done,status:"ok",src:data.url}]);
     } else {
@@ -37 +38 @@
   derivatives.elements = [];
   var ids = derivatives.elements.splice(0, 500);
-  var params = { max_urls: 10, ids: ids, types: [], src: []  };
+  var params = { max_urls: 10, ids: ids, types: [], src: [],width:[], height:[]  };
 
   function getDerivativeUrls(nofile) {
@@ -49 +50 @@
           params.types.push(t.type);
           params.src.push(t.file);
+          params.width.push(t.width);
+          params.height.push(t.height);
+
         } else if (~jQuery.inArray(t.file, params.src)) {
           jQuery.noop();
@@ -55 +59 @@
           params.types.push(t.type);
           params.src.push(t.file);
+          params.width.push(t.width);
+          params.height.push(t.height);
         }
       }
@@ -62 +68 @@
             derivatives.elements = params.ids;
     derivatives.total += params.src.length;
- 
-
-  Set_images = function (dataUrls) {
-    if (typeof jQuery.manageAjax != "undefined") {
-      for (var i = 0; i < dataUrls.length; i++) {
-        jQuery.manageAjax.add("queued", {
-          type: 'GET',
-          url: 'i.php?' + dataUrls[i] + "&ajaxload=true",
-          dataType: 'json',
-          success: (function (data) {
-            derivatives.done++;
-            progress(true, data);
-          }),
-          error: (function (data) {
-            derivatives.done++;
-            progress(data.statusText == "NOK", data);
-          }),
-          fail: (function (data) {
-            a = data.statusText;
-          }),
-          progress: (function (data) {
-            a = data.statusText;
-          }),
-
-          complete: (function (data) {
-            progress(false, data);
-          }),
-          isRejected: (function (data) {
-            a = data.responseText;
-          })
-
-        });
-      }
-
-    }
-  }
 
 
+    Set_images = function (dataUrls) {
+      if (typeof jQuery.manageAjax != "undefined") {
+        for (var i = 0; i < dataUrls.length; i++) {
+          fichier = dataUrls[i];
+          if (fichier != "")
+            jQuery.manageAjax.add("queued", {
+              type: 'GET',
+              url: 'i.php?' + fichier + "&ajaxload=true",
+              dataType: 'json',
+              success: (function (data) {
+                j = derivatives.done;
+                derivatives.done++;
+                for (var j = 0; j < params.src.length; j++) {
+                  if (data.url.match(params.src[j])) {
+                    params.src[j] = ""; break;
+                  }
+                }
+                progress(true, data);
+              }),
+              error: (function (data) {
+                // derivatives.done++;
+                progress(data.statusText == "NOK", data);
+              }),
+              fail: (function (data) {
+                a = data.statusText;
+              }),
+              progress: (function (data) {
+                a = data.statusText;
+              }),
+
+              complete: (function (data) {
+                progress(false, data);
+              }),
+              isRejected: (function (data) {
+                a = data.responseText;
+              })
+
+            });
+        }
+
+      }
+    }
+
+    jQuery("body").append("<div style='position:abosolute;left:-200;top:-200'>");
   if (derivatives.elements.length) {
     if (derivatives.total - derivatives.done > 0)

extensions/Autosize/template/autosize.tpl

@@ -3 +3 @@
  <script type="text/javascript"> 
 var  Autosize_options={ldelim}
+        cl_version :'{$cl_version}',
+        Version_pwg:'{$Version_pwg}',
         COOKIE_PATH:'{$COOKIE_PATH}',
         has_pamoorama: '{$has_pamoorama}',