Changeset 8807 for extensions/Autosize

Timestamp:

Jan 20, 2011, 4:44:46 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] center picture in class "autosize"

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (2 diffs)
• js/jquery.dimensions.js (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/Autosize/js/Affiche_script.js

@@ -84 +84 @@
     var winwidth = jQuery(window).width();
     var winheight = jQuery(window).height();
-    h1 = jQuery(Obj).infos();
-        h1 = (winheight - h1.top - 5);
-        rap = jQuery(Obj).find("img").height() / jQuery(Obj).find("img").width();
-        Obj.height(h1);   w1=(h1 / rap);
-        Obj.css({ height: h1 + "px",width:w1+"px", margin: "auto" });
-        img = jQuery(Obj).find("img") ;
+    info_Obj = jQuery(Obj).infos();
+    h1_left = jQuery(Obj).absoluteLeft();
+        h1_top = jQuery(Obj).absoluteTop();
+        h1 = (winheight - h1_top);
+     img = jQuery(Obj).find("img") ;
+     rap = jQuery(img).height() / jQuery(img).width();
+     w2 = (h1 / rap);
+     
+     if (w2 < info_Obj.width)
+         marginLeft = info_Obj.left + parseInt((info_Obj.width - w2) / 2)+"px";
+     else
+         marginLeft = "auto";
+     Obj.css({ width: "auto",
+         marginLeft: "auto",
+              verticalAlign: "middle", textAlign: "center"
+               });
+        Obj.height(h1);
+         
+
            img.height(h1);        
-           img.width(w1);              
+           img.width(w2);              
 
 
@@ -1223 +1236 @@
         info_description.bottom -= info_img.top;
     }
-    if (msie == true) info_description.bottom -= 4;
+ //   if (msie == true) info_description.bottom -= 4;
 
     info_description.height = info_description.bottom - info_description.top;

extensions/Autosize/js/jquery.dimensions.js

@@ -58 +58 @@
             }) : this[0] == window || this[0] == document ? self[(name == 'Left' ? 'pageXOffset' : 'pageYOffset')] || jQuery.boxModel && document.documentElement['scroll' + name] || document.body['scroll' + name] : this[0]['scroll' + name];
         };
+        //================================================
+        jQuery.fn['absolute' + name] = function (val) {
+            if (!this[0]) return;
+                       a = jQuery(this[0]);
+            m = 0;
+            while (a.length > 0) {
+                val = jQuery(a).infos();
+                if (val.position != "absolute") {
+                    m += name == 'Left' ? val.left : val.top;
+                    m += name == 'Left' ? val.margin.left : val.margin.top;
+                    m += name == 'Left' ? val.margin.right : val.margin.bottom;
+                    m += name == 'Left' ? val.borderwidth.left : val.borderwidth.top;
+                 //   m += name == 'Left' ? val.borderwidth.right : val.borderwidth.bottom;
+                 //   m += name == 'Left' ? val.padding.left : val.padding.top;
+                 //   m += name == 'Left' ? val.padding.right : val.padding.bottom;
+                     a = jQuery(a).offsetParent();
+                } else
+                    break;
+
+            }
+            //306
+
+
+            return m;
+
+
+        };
+
 
     });
+    //=====================================================
     jQuery.fn.extend({
 
@@ -159 +188 @@
                     Cl_Position = { Top: 0, Left: 0 };
                 } else {
-                    Cl_Position = jQuery(elem).position();
+                    Cl_Position = jQuery(elem).d_position();
                 }
                 Left = Cl_Position.left;
@@ -185 +214 @@
         * Cl_Position de l'object elem
         */
-        position: function () {
+        d_position: function () {
             var left = 0, top = 0, elem = this[0], offset, parentOffset, offsetParent, results;
 

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 1.4.33
+Version: 1.4.34
 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448