Changeset 18726 for extensions/Autosize

Timestamp:

Oct 23, 2012, 3:26:03 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (charlie)

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (1 diff)
• js/Affiche_script.js (modified) (4 diffs)

extensions/Autosize/autosize.inc.php

@@ -194 +194 @@
 if ( preg_match("|charlie|", $content, $val) ){   
   $ncount=1;    
-  $content=str_replace( "<object" ,  "<object id='theMainImage' name='theMainImage' "  ,$content,$ncount);
-  $content=str_replace( "<embed" ,  "<embed id='theMainImage' name='theMainImage' "  ,$content,$ncount);
+  $content=str_replace( "<object" ,  "<object id='theMainImage_obj' name='theMainImage' "  ,$content,$ncount);
+  $content=str_replace( "<embed" ,  "<embed id='theMainImage_emb' name='theMainImage' "  ,$content,$ncount);
   $content=  preg_replace($pattern, "", $content);
   $content= "<div id='theMainImage' style='height:".$theImageHeight."px  ;width:".$theImageWidth."px' >". $content . "<img src='".AUTOSIZE_PATH . "images/transparent.gif' /></div>";
- $content= "<style>#theImageAndInfos{height:auto;width:auto;border:1px solid red;position:relative}
-  #theImage{height:auto;border:1px solid blue;align:center;text-align:center;width:100%;position:relative}
-  #theMainImage{height:auto;border:10px solid blue;align:center;text-align:center;position:static}   
+ $content= "<style>#theImageAndInfos{height:auto;width:auto;position:relative}
+  #theImage{height:auto;align:center;text-align:center;width:100%;position:relative}
+  #theMainImage{height:auto;align:center;text-align:center;position:static}   
  </style>".$content;
 return  $content;

extensions/Autosize/js/Affiche_script.js

@@ -930 +930 @@
           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 (Type_Img == "charlie") {
+          swfobj = jQuery("#theMainImage").infos({ absolute: true });
+
+          jQuery("#theMainImage_obj").attr({height: Zone_image.image.height,width:Zone_image.image.width-50});
+          jQuery("#theMainImage_emb").attr({ height: Zone_image.image.height, width: Zone_image.image.width });
+
+        }
 
 
@@ -1218 +1225 @@
       jQuery("#map").removeAttr("width");
       jQuery("#map").width(infos_theImage.width - (infos_mapPicture.width));
-      jQuery("#map").height(jQuery(window).height()-infos_theImage.top-infos_theImage.general.marges.height);
+      jQuery("#map").height(jQuery(window).height() - infos_theImage.top - infos_theImage.general.marges.height);
       return true;
     }
@@ -1666 +1673 @@
       if (chk == "") { return; }
 
-      if (Type_Img == "img")
+      if (Type_Img != "map")
         Select_Image();
       infos_theMainImage = jQuery(theMainImage_id).infos({ absolute: true });
@@ -2138 +2145 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                            // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                              // ready