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

Timestamp:

Nov 6, 2012, 3:30:32 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (charlie's)

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -299 +299 @@
     }
     //__________  Set_llbgo _______________
-
+    var wpng = 0;
     /********************************************
     *  window LOAD
@@ -310 +310 @@
       infos_theMainImage = jQuery(theMainImage_id).infos({ absolute: true });
       infos_theImageAndInfos = jQuery(theImageAndInfos_id).infos();  // Cadre general
-      infos_theMainImage_obj = jQuery("#" + "theMainImage_obj").infos();
+      theMainImage_obj = "theMainImage_obj";
+      infos_theMainImage_obj = jQuery("#" + theMainImage_obj).infos({ absolute: true });
+
       infos_theMainImage_obj.rapport = infos_theMainImage_obj.width / infos_theMainImage_obj.height;
-
       if (infos_theMainImage.width == 0) {
-        if (Type_Img == "charlie") {
+        if (Type_Img == "pamoorama") {
+          infos_theMainImage = jQuery("#pamoorama").infos(true);
+          theMainImage_id = "#pamoorama";
+          options.valide = true;
+        } else if (Type_Img == "charlie") {
           infos_theMainImage = jQuery("#charlie").infos(true);
           theMainImage_id = "charlie";
@@ -331 +336 @@
           jQuery("#iframe").height(infos_theMainImage.height);
 
-        } else if (Type_Img == "pamoorama") {
-          infos_theMainImage = jQuery("#pamoorama").infos(true);
-          theMainImage_id = "#pamoorama";
-          options.valide = true;
+
 
         } else {
-
           jQuery("img").each(function (i) {
-
             imgSrc = options.imgSrc;
-
-
           });
           infos_theMainImage = jQuery("#theImage img").infos();
-
         }
         if (infos_theMainImage.id == "")
@@ -873 +870 @@
 
         if (Type_Img == "charlie" || Type_Img == "iframe") {
-          jQuery("#" + "theMainImage_obj").attr("width", Zone_image.image.height * infos_theMainImage_obj.rapport);
-          jQuery("#" + "theMainImage_obj").attr("height", Zone_image.image.height);
-          jQuery("#" + Type_Img).attr("width", Zone_image.image.width);
-          jQuery("#" + Type_Img).attr("height", Zone_image.image.height);
-          swfobj = jQuery("#" + Type_Img).infos({ absolute: true }); 
+
+
+          if (Type_Img == "charlie") {
+            dp1 = jQuery("#charlie").offset();
+            dp = jQuery("#" + theMainImage_obj).offset();
+            if (dp) {
+              if (wpng == 0)
+                wpng = (dp.left - dp1.left) * 2;
+            }
+            mrgl = (jQuery("#" + "theImage").width() - Zone_image.image.width) / 2;
+            png_h = jQuery("#" + Type_Img + " div").height();
+            jQuery("#" + Type_Img).css({ marginLeft: mrgl + "px" });
+            jQuery("#" + Type_Img).width(Zone_image.image.width);
+            jQuery("#" + Type_Img).height(Zone_image.image.height);
+
+            w01 = jQuery("#" + theMainImage_obj).width();
+            jQuery("#" + theMainImage_obj).attr("width", Zone_image.image.width - wpng);
+            jQuery("#" + theMainImage_obj).attr("height", Zone_image.image.height);
+            jQuery("#theMainImage_emb").attr("width", Zone_image.image.width - wpng);
+            jQuery("#theMainImage_emb").attr("height", Zone_image.image.height);
+            jQuery("#theMainImage").height(png_h);
+            jQuery("#" + Type_Img).height(png_h);
+          
+
+          } else {
+            jQuery("#" + theMainImage_obj).attr("width", Zone_image.image.width);
+            jQuery("#" + theMainImage_obj).attr("height", Zone_image.image.height);
+            jQuery("#" + Type_Img).attr("width", Zone_image.image.width);
+            jQuery("#" + Type_Img).attr("height", Zone_image.image.height);
+          }
+
+
+
+          jQuery("#" + Type_Img).show(options.fade_in);
         }
 
@@ -1335 +1361 @@
         options.theImageMargeZone = Zone_image.marges;
         if (Type_Img != 'charlie') {
-          /*
-          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize") {
-          options.pictureMap = options.pictureDeriv;
-            
-          imgSrc = options.liste_type[6];
-          changeImgSrc(imgSrc, options.pictureDeriv, options.pictureMap, options.pictureSelType);
-          src = theImg.src;
-          return;
-          } else {
-          IMg = Get_Maxi(Zone_image.image);
-          }
-          */
           IMg = Get_Maxi(Zone_image.image);
           imgSrc = IMg.url;
@@ -1374 +1388 @@
         identique = Zone_image.src.match(RegExp(imgSrc, "gi"));
         if (identique) return;
-        href_path = "javascript:changeImgSrc('" + imgSrc + IMg.pictureDeriv + "', '" + "', '" + IMg.pictureMap + "', '" + options.pictureSelType + "')";
+        href_path = "javascript:changeImgSrc('" + imgSrc + "', '" + IMg.pictureDeriv + "', '" + IMg.pictureMap + "', '" + options.pictureSelType + "')";
         jQuery(".linkAutosize").attr("href", href_path);
         theImg = document.getElementById(theMainImage_id.replace("#", ""));
@@ -1635 +1649 @@
       }
       if (Type_Img == "charlie") {
+        width_theMainImage = height_theMainImage * options.ratio;
+        Zone_image.image_init.rapport = options.ratio;
 
       } else if (Type_Img == "pamoorama") {
@@ -1769 +1785 @@
         case "charlie":
 
+          Zone_image.zoom = 1;
+
           break
 
         case "iframe":
+          wpng = 0;
           Zone_image.image.width = options.theImageWidth;
           Zone_image.image.height = options.theImageHeight;
@@ -2128 +2147 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // ready