Changeset 18725 for extensions/Autosize/js/Affiche_script.js

Timestamp:

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

Author:

cljosse

Message:

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

File:

• extensions/Autosize/js/Affiche_script.js (modified) (8 diffs)

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