Changeset 6978 for extensions/Autosize/js

Timestamp:

Sep 20, 2010, 5:31:13 PM (14 years ago)

Author:

cljosse

Message:

[Autosize]Improvement theme compatibility.

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -1 +1 @@
 jQuery.noConflict();
 jQuery(document).ready(
+
+
 function (jQuery) {
+    function Marge_haute(myObj, ajoute_h) {
+        if (ajoute_h) h_p = parseInt(jQuery(myObj).height());
+        else h_p = 0;
+
+        if (jQuery(myObj).css("marginTop"))
+            if (jQuery(myObj).css("marginTop") != "auto") h_p += parseInt(jQuery(myObj).css("marginTop"));
+        if (jQuery(myObj).css("marginBottom"))
+            if (jQuery(myObj).css("marginBottom") != "auto") h_p += parseInt(jQuery(myObj).css("marginBottom"));
+        if (jQuery(myObj).css("paddingTop"))
+            if (jQuery(myObj).css("paddingTop") != "auto") h_p += parseInt(jQuery(myObj).css("paddingTop"));
+        if (parseInt(jQuery(myObj).css("paddingBottom")))
+            if (jQuery(myObj).css("paddingBottom") != "auto") h_p += parseInt(jQuery(myObj).css("paddingBottom"));
+        return h_p;
+    }
     //===================================================================       
+
 
 
     jQuery(window).resize(function (event, ui) {
         if (typeof (event) == 'undefined') return;
+
         var Type_Img = "";
         //====== détection du type d'images ======
@@ -22 +40 @@
             return;
         }
+
+
         //=================================================================
         switch (Type_Img) {
             case "img":
                 var Image = jQuery("#theImage").find("img");
-                var TheImg = jQuery(Image).get(0);
+                var TheImg = jQuery("#theImg").find("img").get(0);
+                if (!TheImg)
+                    TheImg = jQuery(Image).get(0);
                 break
             case "img_autre":
@@ -39 +61 @@
                 break
             case "pamoorama":
+                //=========================================================
                 var Images = jQuery("#pamoorama");
                 var Image = jQuery(Images).get(0);
@@ -44 +67 @@
                 var TheImg = jQuery("#pamoorama").get(0);
                 if (!TheImg) return;
+                TheImg = jQuery("#pamoorama_inner");
+                if (TheImg.length < 1) return;
+
                 break
         }
@@ -49 +75 @@
         //==================================================================================
         var sel0 = jQuery(TheImg).position();
+
         if (!sel0) return;
+        type_pos = jQuery(TheImg).css("position"); //static
+        if (jQuery(TheImg).css("position") == "relative") {
+            sel0.top += Marge_haute("#theHeader", true);
+            sel0.top += Marge_haute("#imageHeaderBar", true);
+            sel0.top += Marge_haute(TheImg, false);
+            if (jQuery("#theImage").css("marginTop"))
+                if (jQuery("#theImage").css("marginTop") != "auto") sel0.top += parseInt(jQuery("#theImage").css("marginTop"));
+            if (jQuery("#theImage").css("paddingTop"))
+                if (jQuery("#theImage").css("paddingTop") != "auto") sel0.top += parseInt(jQuery("#theImage").css("paddingTop"));
+
+        }
 
         mini_width = parseInt(mini_width);
@@ -81 +119 @@
             for (var i = 0; i < Pars.length; i++) {
                 P0 = Pars.get(i);
-                h_p += parseInt(jQuery(P0).height());
-             if (jQuery(P0).css("marginTop"))
-                    if (jQuery(P0).css("marginTop") != "auto") h_p += parseInt(jQuery(P0).css("marginTop"));
-             if (jQuery(P0).css("marginBottom"))
-                    if (jQuery(P0).css("marginBottom") != "auto") h_p += parseInt(jQuery(P0).css("marginBottom"));
-             if (jQuery(P0).css("paddingTop")) h_p += parseInt(jQuery(P0).css("paddingTop"));
-             if (parseInt(jQuery(P0).css("paddingBottom"))) h_p += parseInt(jQuery(P0).css("paddingBottom"));
-
+                h_p += Marge_haute(P0, true);
             }
 
@@ -101 +132 @@
         var Image_height = (winheight - sel0.top) - parseInt(marge_basse) - lmt;
         var height_user = eval(user_status + "_height");
-        var width_user = eval(user_status + "_width");
+
         //=============================================================
         var reg1 = new RegExp("%", "g");
@@ -108 +139 @@
         else
             Image_height = parseInt(height_user);
-        //=============================================================
+
+        //============================================================
         echelle_max = parseFloat(echelle_max, '3');
         var echelle = parseFloat(Image_height / H0, 3);
@@ -117 +149 @@
         }
 
-        var Imgage_Width = parseInt(Image_height * rapport);
-        jQuery("#theImage").width("100%");
-        jQuery("#theImage").height("auto");
-
-
+        var Image_Width = parseInt(Image_height * rapport);
+
+        //===============================================================
+        twidth = jQuery("#imageHeaderBar").width();
+        img_la = jQuery(TheImg).width(); //initiale 
+        offset = jQuery(TheImg).position();
+
+        var winwidth = jQuery(window).width();
+        var width_user = eval(user_status + "_width");
+         
+        if (check_auto_w == 'checked="checked"') {
+            if (Type_Img != "pamoorama") {
+                widthmin = (winwidth - offset.left);
+
+                if (Image_Width > widthmin) {
+                    //=============================================================
+                    if (width_user.match(reg1))
+                        Image_Width = Image_Width * parseInt(width_user) / 100;
+                    else
+                        Image_Width = parseInt(width_user);
+
+                    var echelle_w = parseFloat(winwidth / W0, 3);
+                    if (echelle_w > echelle_max) {
+                        echelle_w = echelle_max;
+                        Image_Width = parseInt(W0 * echelle_w);
+                    }
+                    Image_Width = parseInt(W0 * echelle_w);
+                     
+                    align_auto = "left";
+                } else {
+                    
+                    align_auto = "center";
+                }
+                Image_height = parseInt(Image_Width / rapport);
+
+            }
+
+
+        }
+        //=============================================================
 
         if (Type_Img == "pamoorama") {
-            h1 = jQuery("#pamoorama").height();
-            jQuery("#pamoorama").css("overflow", "hidden");
-            jQuery("#pamoorama").css(jQuery(window).width() + "px");
-  
+
+
+            jQuery("#pamoorama").css("height", Image_height + "px");
+            jQuery("#pamoorama").css("width", twidth + "px");
+
+            jQuery("#pamoorama").height(Image_height + "px");
+            jQuery("#pamoorama").width(twidth + "px");
+
+
+
+            jQuery("#pamoorama_outter").height(Image_height + "px");
+            jQuery("#pamoorama_outter").width(twidth + "px");
+
             jQuery("#pamoorama_outter").css("height", Image_height + "px");
-            jQuery("#pamoorama_outter").css("width", jQuery(window).width() + "px");
-/*
-            jQuery(TheImg).css(Image_height + "px");
-            jQuery(TheImg).css(jQuery(window).width() + "px");
-            */
+            jQuery("#pamoorama_outter").css("width", twidth + "px");
+
             zoom = Image_height / img_height;
 
-            jQuery("#pamoorama_inner").css("zoom", zoom);
+            h_frame = jQuery("#pamoorama_frame").height();
+            h_width = jQuery("#pamoorama_frame").width();
+            jQuery(TheImg).css("zoom", zoom);
 
 
 
         } else {
-        jQuery(TheImg).height(Image_height + "px");
-        jQuery(TheImg).width(Imgage_Width + "px");
+            if (jQuery("#theImg").css("textAlign"))
+                jQuery("#theImg").css("textAlign", align_auto);
+ 
+            jQuery(TheImg).height(Image_height + "px");
+            jQuery(TheImg).width(Image_Width + "px");
+            jQuery(TheImg).css("height", Image_height + "px");
+            jQuery(TheImg).css("width", Image_Width + "px");
 
         }
@@ -155 +235 @@
 
     //===================================================================         
+
     jQuery(window).resize();
+
     jQuery(window).resize();