Changeset 19166

Timestamp:

Nov 25, 2012, 11:01:31 AM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (Autosize margin )

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -491 +491 @@
     //===================
     // options 
-    //===================
-
     //=========================================================
-    /*messages = "This frame uses the W3C box model: <span>" + jQuery.support.boxModel + "</span>";
-    messages += "This frame uses the html5Clone: <span>" + jQuery.support.html5Clone + "</span>";*/
-    // jQuery("p").html(messages);
     if (typeof (options) == "undefined") {
       options = { imageAutosize: false }
@@ -518 +513 @@
     options.valide = jQuery(".Autosize").css("display") != "none";
     options.marge_haute = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("top"));
-    options.marge_basse = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("bottom"));
+  options.marge_basse = Math.max(
+  jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("bottom")),
+  options.marge_basse
+  );
+
     options.marge_gauche = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("left"));
     options.marge_droite = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("right"));
@@ -901 +900 @@
         if (options.imageAutosize == true) {
           options.pictureSelType = options.pictureDeriv;
-        Zone_image.image_init.width = jQuery(theImg).width();
-        Zone_image.image_init.height = jQuery(theImg).height();
+          Zone_image.image_init.width = jQuery(theImg).width();
+          Zone_image.image_init.height = jQuery(theImg).height();
           set_cl("no");
           Set_llbgo(true);
@@ -949 +948 @@
         if (options.imageAutosize == false)
           if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
-            jQuery(theMainImage_id).height(Zone_image.image.height);
+            jQuery(theMainImage_id).height(Zone_image.image.height );
             jQuery(theMainImage_id).width(Zone_image.image.width);
+           
+            jQuery(theMainImage_id).css("margin-top", options.marge_haute );
 
           } else {
@@ -1752 +1753 @@
       if (!options.check_desc_v)
         options.marge_bottom_2 = 0;
-      else
-        options.marge_bottom = 0;
+      
 
       marge_bottom = options.marge_bottom_2 + options.marge_bottom;
@@ -1832 +1832 @@
       options.theImageRight = (new_win.width - new_dim.right);
       options.marge_bottom_2 = Math.ceil(new_dim.out.bottom - new_img.out.bottom);
+
       if (Type_Img == "iframe") { }
       new_dim.out.bottom = new_win.height - options.marge_bottom_2;
@@ -1837 +1838 @@
       options.theImageBottom = new_win.height - new_dim.out.bottom;
       if (options.slideshow) {
-
         options.marge_top = 0;
       } else {
-        options.marge_top = Math.ceil(new_img.top - new_dim.top);
+        options.marge_top_2 = Math.ceil(new_img.top - new_dim.top) + options.marge_top;
       }
 
@@ -1846 +1846 @@
         options.theImageBottom_2 = 0;
       }
+
       options.theImageWidth = new_win.width - options.theImageLeft - options.theImageRight;
       options.theImageHeight = new_win.height - options.marge_top - options.theImageBottom - options.theImageTop;
@@ -2273 +2274 @@
 
 
-  });                                                                                                               // ready
+  });                                                                                                                // ready