Changeset 18946 for extensions/Autosize

Timestamp:

Nov 6, 2012, 8:58:56 AM (11 years ago)

Author:

cljosse

Message:

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

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -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();
+      infos_theMainImage_obj.rapport = infos_theMainImage_obj.width / infos_theMainImage_obj.height;
 
       if (infos_theMainImage.width == 0) {
@@ -316 +318 @@
           theMainImage_id = "charlie";
           options.valide = true;
+
+
         } else if (Type_Img == "iframe") {
 
@@ -530 +534 @@
     Get_type_img();
 
+    var infos_theMainImage_obj;
     var theMainImage_id = "#theMainImage";
     var theImage_id = "#theImage";
@@ -867 +872 @@
 
 
-          if (Type_Img == "charlie" || Type_Img == "iframe") {
-            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);
-          swfobj = jQuery("#" + Type_Img).infos({ absolute: true });
-
-          //  jQuery("#" + Type_Img).attr({ height: Zone_image.image.height, width: Zone_image.image.width - 50 });
-          //  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 });
-
+        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 }); 
         }
 
@@ -2128 +2128 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 // ready