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

Timestamp:

Jan 26, 2011, 12:52:35 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] compatibility whith piwigo 2.2

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -51 +51 @@
 function Wait_Affichage() {
     fade_in = parseInt(fade_in);
-   
+
     if (!jQuery().newResize()) {
         setTimeout("Wait_Affichage()", 500);
         return
     }
- nu_img++;
+    nu_img++;
     if (fade_in == 0) {
         jQuery(Parent).css({ opacity: "1" });
@@ -73 +73 @@
                        }
               );
-                   }
-                   if (nu_img > 1) return;
-
-                  
+    }
+ //   if (nu_img > 1) return;
+
+
 
     img_h = jQuery(TheImg).height();
@@ -85 +85 @@
     jQuery("#ret_autosize").val(src_img);
 
-    jQuery("#ret_autosize").trigger('ON');
+    jQuery("#ret_autosize").trigger('ON', { width: img_w, height: img_w, theImage: TheImg, src_img: src_img });
 
 
@@ -97 +97 @@
 
 
-
     conf = jQuery(Obj).get(0).conf;
     Obj = jQuery(Obj).get(0).obj;
     myWindow = jQuery("#" + conf.parent).infos();
 
-    if (myWindow == 0) myWindow = jQuery(window).infos();
+    if (myWindow.width == 0) myWindow = jQuery(window).infos();
     marge_basse = 0;
     if (conf.MargeBasse)
@@ -108 +107 @@
             conf.MargeBasse
     );
+    marge_top = 0;
+    if (conf.MargeHaute)
+        marge_top = jQuery().Get_Val_int(
+            conf.MargeHaute
+    );
+
     info_Obj = jQuery(Obj).infos();
     h1_left = jQuery(Obj).absoluteLeft();
     h1_top = jQuery(Obj).absoluteTop();
-    if (typeof old_h1 == "undefined") old_h1 = 0;
-
-
 
     if (h1_top < info_Obj.height)
-        h1 = (myWindow.height - h1_top - marge_basse);
+        h1 = (myWindow.height - h1_top - marge_basse - marge_top);
     else
         h1 = (myWindow.height - marge_basse);
 
-    if (h1 == old_h1) return;
-    old_h1 = h1;
-
-    imgs = jQuery(Obj).find("img");
-    rap = jQuery(imgs).height() / jQuery(imgs).width();
-    w2 = (h1 / rap);
-
-    // ("source:" + message);
+
+    rap = info_Obj.height / info_Obj.width;
+    w2 = parseInt(h1 / rap);
 
     if (w2 < info_Obj.width)
@@ -134 +131 @@
         marginLeft = "auto";
 
-    jQuery(Obj).css({ width: "auto",
+    jQuery(Obj).css({ width: "auto",marginTop:marge_top,
         marginLeft: "auto", marginBottom: 0 + "px",
         verticalAlign: "middle", textAlign: "center"
     });
     jQuery(Obj).height(h1);
+
     //=============================================================
     if (conf.ResizePicture != "true") {
 
     } else
-        jQuery(imgs).each(function (i) {
-            img = jQuery(this);
-            rap = jQuery(this).height() / jQuery(this).width();
-            w2 = parseInt(h1 / rap);
-            if (w2 > 0 && h1 > 0 && img.length > 0) {
-                img.height(h1);
-                img.width(w2);
-            }
-
-        });
+        imgs = jQuery(Obj).find("img");
+    Obj_w = jQuery(Obj).width();
+    Obj_h = jQuery(Obj).height();
+
+    jQuery(imgs).each(function (i) {
+        img = jQuery(this);
+
+        info_img = { width: conf.width[i], height: conf.height[i] };
+        img_rap = conf.rap[i];
+
+        if (info_img.width > Obj_w) h1 = parseInt(Obj_w / img_rap);
+        else w2 = parseInt(Obj_h * img_rap);
+        if (w2 > 0 && h1 > 0 && img.length > 0) {
+            img.height(h1);
+            img.width(w2);
+        }
+
+    });
 
 
@@ -176 +182 @@
                     conf[jQuery.trim(tableau2[0])] = jQuery.trim(tableau2[1]);
                 }
+                imgs = jQuery(a).find("img");
+                rap = new Array();
+                width = new Array();
+                height = new Array();
+                jQuery(imgs).each(function (i) {
+                    img = jQuery(this);
+                    rap.push((img.width() / img.height()));
+                    width.push( img.width()   );
+                    height.push( img.height() );
+                });
+
+                conf['rap'] = rap;
+                conf['width'] = width;
+                conf['height'] = height;
 
                 List_autosize.push({ obj: a, conf: conf });
@@ -190 +210 @@
 
 function List_autosize_resize(event, ui) {
+    if (typeof wait_resize == "undefined") wait_resize = false;
+    if (wait_resize == true) return;
+
+    wait_resize = true;
     if (List_autosize.length == 0) return;
     for (i = 0; i < List_autosize.length; i++) {
         Autosize_resize(jQuery(List_autosize[i]));
     }
+    wait_resize = false;
 
 }