Changeset 18725 for extensions/Autosize

Timestamp:

Oct 23, 2012, 3:04:22 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (rv map)

Location:

extensions/Autosize

Files:

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

extensions/Autosize/autosize.inc.php

@@ -91 +91 @@
 *********************/
 static public function init($content,$element_info){
- 
-
   global  $template,$version,$icon_path,$page,$picture,$conf;
   global $user,$Css,$css_slideshow,$css_display,$liste_type;
@@ -176 +174 @@
   if($has_pamoorama=="true"){ 
   if($DEBUG_autosize == "c1") echo  $theImageWidth . "x" . $theImageHeight ;
- 
- $pattern[0] = '/width\:(.*)(\d+),/';$replacement[0] = 'width:  '.$theImageWidth.' ,'; 
- 
+      $pattern[0] = '/width\:(.*)(\d+),/';$replacement[0] = 'width:  '.$theImageWidth.' ,';  
       if(($theImageWidth!=0)){      
             $content=  preg_replace($pattern, $replacement, $content);
@@ -188 +184 @@
       return  $content;
   }
-
+if(isset($_GET['map'])){
+return  $content;
+}
  $pattern[0] = '/width\:(.*)(\d+)px/';$replacement[0] = 'width:100% '; 
  $pattern[1] = '/height\:(.*)(\d+)px/';$replacement[1] = 'height:100% '; 
@@ -195 +193 @@
 
 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=  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}
- 
-  
+  #theMainImage{height:auto;border:10px solid blue;align:center;text-align:center;position:static}   
  </style>".$content;
-
-
 return  $content;
  }
 
  $content=  preg_replace($pattern, "", $content);
-  
+  return  $content;
 }//INIT
 

extensions/Autosize/js/Affiche_script.js

@@ -106 +106 @@
         infos_pamoorama = jQuery("#pamoorama").infos({ absolute: true });
 
-      } else if (jQuery("#map").length) {
+      } else if (jQuery("#map").length > 0 || jQuery("#mapPicture").length > 0) {
         Type_Img = "map";
       } else if (jQuery("#Panorama").length) {
@@ -546 +546 @@
 
 
+
     jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
     jQuery('#derivativeChecked' + options.pictureSelType).css('visibility', 'visible');
@@ -885 +886 @@
       n = Get_dimensions(true, options);
 
+      if (n == false) return;
+
       Save_cookies(options);
       if (options.pictureSelType != "Autosize" && options.pictureSelType != "SelMaxi") {
@@ -891 +894 @@
       }
       infos_theImage = jQuery(theImage_id).infos(true);
-      if (typeof img_finale == "undifined") img_finale = { width: Zone_image.image.width, height: Zone_image.image.height };
+      if (typeof img_finale == "undefined") img_finale = { width: Zone_image.image.width, height: Zone_image.image.height };
       if (img_finale.width && (img_finale.width != Zone_image.image.width || img_finale.height != Zone_image.image.height)) {
-
         img_finale = { width: Zone_image.image.width, height: Zone_image.image.height };
       }
@@ -1209 +1211 @@
     //===========================================
     Set_Map = function (nds) {
-      p0 = jQuery("#map").position();
+      p0 = jQuery("#map").offset();
       if (!p0) return;
-
-      infos_map = jQuery("#map").infos();
-      // if (infos_map.width == (Zone_image.container.width - p0.left))   return ;
-      nds = jQuery("#imageInfos").css("display");
-      if (nds != "none") {
-        p2 = jQuery("#infoSwitcher").infos();
-        p0.left += 35;
-      }
-      jQuery("#map").width(Zone_image.image.width);
-      jQuery("#map").css({ height: Zone_image.image.height + "px" });
-
+      infos_mapPicture = jQuery("#mapPicture").infos({ absolute: true });
+      infos_theImage = jQuery("#theImage").infos({ absolute: true });
+      jQuery("#map").removeAttr("height");
+      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);
       return true;
     }
@@ -1493 +1490 @@
       // commentContent
       // copyright 
-   
+
 
 
@@ -1660 +1657 @@
       options.theImageWidth = new_dim.width;
       options.theImageHeight = new_dim.height;
-
-
       if (options.theImageBottom < 0) {
         options.theImageBottom = 0;
       }
+
+
+
       var chk = eval("options." + user_status + "_enabled");
       if (chk == "") { return; }
 
-      Select_Image();
-      infos_theMainImage = jQuery(theMainImage_id).infos();
+      if (Type_Img == "img")
+        Select_Image();
+      infos_theMainImage = jQuery(theMainImage_id).infos({ absolute: true });
       Zone_image.src = infos_theMainImage.src;
       useMap = options.pictureSelType;
@@ -2139 +2138 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                      // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                            // ready
 
 

extensions/Autosize/main.inc.php

@@ -43 +43 @@
 /**/
 add_event_handler('render_element_content',  array(&$autosize_controler,'init'),EVENT_HANDLER_PRIORITY_NEUTRAL-1,2  );
-
 add_event_handler('render_element_content',  array(&$autosize_controler,'init2'),EVENT_HANDLER_PRIORITY_NEUTRAL+1,2  );
 add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_script_1') );
@@ -49 +48 @@
 add_event_handler('loc_after_page_header',array(&$autosize_controler, 'cl_autosize_script_3')  );
 add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_affiche'), EVENT_HANDLER_PRIORITY_NEUTRAL +21    );
-
 }
 
+
+
+
 ?>