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

Timestamp:

Sep 25, 2012, 12:36:16 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, store typesize

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -443 +443 @@
       marges_llgbo = 0;
       //========================================================================================== 
-       
+
       init_gen();
       jQuery(window).resize();
@@ -511 +511 @@
     jQuery("#form_autosize_picture").addClass("Autosize_margin");
     //===== marges suplémentaires en fonction theme ===
+    options.valide = jQuery(".Autosize_margin").css("display");
     options.marge_haute = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("top"));
     options.marge_basse = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("bottom"));
@@ -551 +552 @@
     var pictureDeriv_maxi = eval("options." + user_status + "_type"); //limite taille
 
+    if (pictureDeriv_maxi != pictureDeriv) {
+      if (pictureDeriv == null)
+        pictureDeriv = pictureDeriv_maxi;
+      else
+        pictureDeriv_maxi = pictureDeriv;
+    }
 
 
@@ -919 +926 @@
         theImg.removeAttribute("width");
         theImg.removeAttribute("height");
+
         // jQuery(theMainImage_id).eq(0).removeAttr("style");
         jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
@@ -933 +941 @@
           jQuery("#loading").hide(0);
         }
-        Zone_image.src = theImg.src;
-        theImg.src = url; // charge Image       
+
+        theImg.src = url; // charge Image   
+        if (Zone_image) {
+          Zone_image.src = theImg.src;
+          Zone_image.image_init = { width: jQuery(theImg).width(), height: jQuery(theImg).height() };
+
+        }
         //===================================================
         options.pictureDeriv = typeSave;
@@ -1296 +1309 @@
           vn = this;
           size_derive = { w: parseInt(vn[2]), h: parseInt(vn[3]) };
+          if (vn[0] == options.select_type) {
+            maxi_size = size_derive;
+            maxi_size.idx = n;
+            return false
+          }
           if (vn[0] != "square" && vn[0] != "thumb" && vn[0] != "SelMaxi" && vn[0] != "Autosize") {
             if (size_derive.h > size_encours.h) {
@@ -1330 +1348 @@
 
     Select_Image = function () {
+
       var pt = options.liste_type;
       if (pt.length > 0) {
@@ -1335 +1354 @@
         //===== calcul Image ===
         Calcul_Image();
-        IMg = Get_Maxi(Zone_image.image);
+
+        if (options.select_type != "SelMaxi" && options.select_type != "Autosize") {
+         
+           IMg = Get_Maxi(Zone_image.image_init);
+        } else {
+          IMg = Get_Maxi(Zone_image.image);
+        }
+
+
         imgSrc = IMg.url;
 
@@ -1341 +1368 @@
         ing_height = IMg.height;
         if (Type_Img == "pamoorama") return;
-        if (options.select_type != "SelMaxi" && options.select_type != "Autosize") return;
+        //  if (options.select_type != "SelMaxi" && options.select_type != "Autosize") return;
+
         if (typeof Zone_image.src == "undefined") Zone_image.src = " ";
         status = imgSrc.match(RegExp(Zone_image.src, "gi")); // status = '' si ==
@@ -1614 +1642 @@
       height_theMainImage = Math.ceil(image_max.height);
       width_theMainImage = Math.ceil(image_max.width);
+      if (typeof Zone_image.image_init.rapport == "undefined") {
+        Zone_image.image_init.rapport = Math.ceil(width_theMainImage) / height_theMainImage;
+      }
 
       if (Type_Img == "pamoorama") {
@@ -1870 +1901 @@
         height = IMg.height;
       }
-      user_status = options.user_status;
-      pictureDeriv_maxi = eval("options." + user_status + "_type"); //limite taille
-      options.pictureDeriv_maxi = pictureDeriv_maxi;
-      pictureDeriv_maxi = options.select_type;
-
+      if (pictureDeriv_maxi != options.select_type) {
+        /*
+        user_status = options.user_status;
+        pictureDeriv_maxi = eval("options." + user_status + "_type"); //limite taille
+        */
+        options.select_type = pictureDeriv_maxi;
+        options.pictureDeriv_maxi = pictureDeriv_maxi;
+        pictureDeriv_maxi = options.select_type;
+      }
       //==========================================================
       href_path = "javascript:changeImgSrc('" + options.src_img + "', '" + "SelMaxi" + "', '" + "SelMaxi" + "')";
@@ -1957 +1992 @@
     //_______________________ init_gen _______________________
 
-  });                                                                                                                                                                                                                                          // ready
+  });                                                                                                                                                                                                                                                      // ready