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

Timestamp:

Jul 12, 2012, 12:33:43 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, fix offset right

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -377 +377 @@
       var winwidth = infos_body.width;
       var winheight = infos_body.height;
-      nds = jQuery("#imageInfos").css("display"); //inline-block //block simple
-      nds1 = jQuery("#menubar").css("display"); //inline
       if (Type_Img == "pamoorama") {
         theMainImage_obj = "#pamoorama";
-      }
-      Zone_image = Calcul_Image(nds == "none");
+        Zone_image = Calcul_Image(infos_imageInfos.visible == false);
+      } else {
+        Zone_image = Calcul_Image(infos_imageInfos.visible == false);
+      }
       //=================================================================
       old_window = jQuery(window).infos();
@@ -577 +577 @@
       jQuery(theMainImage_obj).height(Zone_image.image.height);
       jQuery(theMainImage_obj).width(Zone_image.image.width);
+      
       return true;
 
@@ -1194 +1195 @@
         //=============================================================
         infos_pamoorama = jQuery("#pamoorama").infos();
-        new_width = infos_pamoorama.width - (infos_pamoorama.borderwidth.left + infos_pamoorama.borderwidth.right);
-        Zone_image = Calcul_Image(false);
-        Set_Pamoorama();
         if (Math.abs(infos_pamoorama.height) < 50) {
           setTimeout("Wait_pamoorama()", 500);
@@ -1203 +1201 @@
         nopano = true;
         theMainImage_obj = "#pamoorama";
+
       }
     } // Wait_pamoorama
@@ -1566 +1565 @@
         if (!nopano) {
           Wait_pamoorama();
+          
         }
         infos_img = jQuery(theMainImage_obj).infos();
         infos_footer = jQuery("#pamoorama_footer").infos();
-
         infos_img.height += parseInt(infos_img.height) + parseInt(infos_footer.height);
 
@@ -1809 +1808 @@
         th = infos_body.height;
         tw = infos_body.width;
-
-        nds = jQuery("#imageInfos").css("display"); //inline-block 
-        Zone_image = Calcul_Image(nds == "none");
+        infos_imageInfos
+
+        Zone_image = Calcul_Image(infos_imageInfos.visible == false);
         n0 = 0;
         n1 = 0;
@@ -1882 +1881 @@
         }
 
-
+        Zone_image = Calcul_Image(infos_imageInfos.visible == false);
         infos_pamoorama = jQuery("#pamoorama").infos();
         infos_pamoorama_outter = jQuery("#pamoorama_outter").infos();
@@ -2078 +2077 @@
       }
 
-      retrait_w = Math.ceil(infos_theImage.margin.left
-                                + infos_theImage.margin.right
-                                + infos_theImage.borderwidth.left
-                                + infos_theImage.borderwidth.right
-                                + infos_theImage.padding.left
-                                + infos_theImage.padding.right);
-
-
-      retrait_w += Math.ceil(infos_the_page.margin.left
-                                + infos_the_page.margin.right
-                                + infos_the_page.borderwidth.left
-                                + infos_the_page.borderwidth.right
-                                + infos_the_page.padding.left
-                                + infos_the_page.padding.right);
-
-      retrait_w += Math.ceil(infos_body.margin.left +
-                                infos_body.margin.right);
-
-      retrait_w += Math.ceil(infos_content.margin.left +
-                                infos_content.margin.right);
+      retrait_w = Math.ceil(infos_theImage.general.marges.width
+
+                                );
+
+
+      retrait_w += Math.ceil(infos_the_page.general.marges.width
+
+                                );
+
+      retrait_w += Math.ceil(infos_body.general.marges.width);
+
+      retrait_w += Math.ceil(infos_content.general.marges.width);
 
 
       pos_top = Math.ceil(infos_theImageAndInfos.top
-                     + infos_theImageAndInfos.margin.top
-                     + infos_content.borderwidth.top
-                     + infos_content.borderwidth.bottom
-                     + infos_content.margin.top
-                     + infos_content.margin.bottom);
+                     + infos_theImageAndInfos.general.marges.height
+);
 
       retrait_h = Math.ceil(pos_top
                          + infos_theImage.margin.top
-                                + infos_theImage.margin.bottom
-                                + infos_theImage.borderwidth.top
-                                + infos_theImage.borderwidth.bottom
-                                + infos_theImage.padding.top
-                                + infos_theImage.padding.bottom);
+                                + infos_theImage.general.marges.height
+                                );
 
 
@@ -2120 +2105 @@
       });
 
-      retrait_img = Math.ceil(infos_theMainImage.borderwidth.left
-                    + infos_theMainImage.borderwidth.right
-                    + infos_theMainImage.padding.left
-                    + infos_theMainImage.padding.right);
-      retrait_img += Math.ceil(infos_llgbo.borderwidth.right + infos_llgbo.borderwidth.right);
-
+      retrait_img = Math.ceil(
+                      infos_theMainImage.general.marges.width
+                    );
+      retrait_img += Math.ceil(
+                       infos_llgbo.borderwidth.left
+                     + infos_llgbo.borderwidth.right
+                     );
+
+      retrait_img += Math.ceil(
+                                  infos_the_page.general.marges.width
+                                );
 
 
 
       //  menuSwitcherwidth+padding
+
 
       if (theme.match(RegExp("elegant", "gi"))) {
         if (all_width != true) {
-          new_width = Math.ceil(
-                                infos_imageInfos.width +
-                                infos_imageInfos.borderwidth.left +
-                                infos_imageInfos.borderwidth.right +
-                                infos_imageInfos.margin.left +
-                                infos_imageInfos.borderwidth.right +
-                                infos_imageInfos.padding.left +
-                                infos_imageInfos.padding.right);
-     
+          marge_right = infos_imageInfos.general.width;
         } else {
-          new_width = 0;
-        }
-        width_theImage = (infos_body.width - new_width)
-        retrait_w += 20; //???
+          marge_right = 0;
+        }
+
+        wx1 = infos_theImage.general.width;
+        width_theImage = (infos_body.width - marge_right - 1)
+
 
       } else if (theme.match(RegExp("stripped", "gi"))) {
@@ -2159 +2144 @@
         marginLeft = infos_content.margin.left;
         infos_menubar_dl = jQuery("#menubar dl").infos();
-        marginLeft = infos_menubar_dl.margin.left + infos_menubar_dl.left + infos_menubar_dl.width;
+        marginLeft = infos_menubar_dl.margin.left
+                    + infos_menubar_dl.left
+                    + infos_menubar_dl.width;
         if (infos_menubar_dl.visible == "false")
          if (!theme.match(RegExp("sylvia", "gi")))
@@ -2267 +2254 @@
     marge_basse = 0;
     if (conf.MargeBasse)
-      marge_basse = jQuery().Get_Val_int(conf.MargeBasse);
+      marge_basse = jQuery(Obj).Get_Val_int(conf.MargeBasse);
     marge_top = 0;
     if (conf.MargeHaute)
-      marge_top = jQuery().Get_Val_int(conf.MargeHaute);
+      marge_top = jQuery(Obj).Get_Val_int(conf.MargeHaute);
     infos_Obj = jQuery(Obj).infos();
     h1_left = jQuery(Obj).absoluteLeft();