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

Timestamp:

Jan 8, 2011, 6:17:44 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] compatibility with theme simple

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -42 +42 @@
                }
         info_pamoorama = jQuery("#pamoorama").infos();
-         new_width= info_pamoorama.width ;
+        new_width = info_pamoorama.width -( info_pamoorama.borderwidth.left + info_pamoorama.borderwidth.right);
          if (  Math.abs(new_width - myPamoorama.options.width)>10  ) {
                  setTimeout("Wait_pamoorama()", 500);
@@ -93 +93 @@
              if (fade_in != 0) {
                  if (msie)
-                     jQuery("#theImage").css({ opacity: "0"  });
+                     jQuery("#theImage").css({ opacity: "0" });
                  else
                      jQuery("#theImage").css({ opacity: "0" });
@@ -235 +235 @@
                  if (n == 0) {
                      n = winheight - old_window.height;
-                     if (n == 0) return true;
+                     if (n == 0)
+                         return true;
                  }
                  old_window = jQuery(window).infos();
@@ -264 +265 @@
                      if (info_ToolBar.width > 0)
                          marge = (Zone_Affichage.width - info_ToolBar.width) / 2;
-                     else if (info_the_page.width>0)
+                     else if (info_the_page.width > 0)
                          marge = (Zone_Affichage.width - info_the_page.width) / 2;
 
@@ -272 +273 @@
                      if (info_content.width > 100) {
 
-                         marge_left = 0;
+                         marge_left = (info_imageInfoBar.margin.left);
                          marge_right = (info_imageInfoBar.margin.left + info_imageInfoBar.margin.right);
                          winwidth = info_content.width;
@@ -676 +677 @@
                  jQuery("#standard").css("top", 0 + "px");
                  jQuery("#comments").css("top", 0 + "px");
-
-
-
-
                  //========== Image Remise à l'échelle =======================
 
                  Image_height = img_finale.height;
                  Image_width = img_finale.width;
-
-
-
                  //=========================================================================
+                 jQuery(Cadre).css({ marginLeft: marge_left + "px"
+                 });
                  jQuery(Cadre).width(Zone_Affichage.width);
                  //   jQuery(Cadre).height(Zone_Affichage.height);
@@ -749 +745 @@
 
                  } else if (Type_Img == "pamoorama") {
-
+                     info_theImage.height = Zone_Affichage.height;
                      img_height = myPamoorama.imageHeight
-                     marge_left += 2;
-
                      if (theme.match(RegExp("simple", "g"))) {
-                         marge_right = 2;
+                         //  marge_right = 2;
                      }
                      new_width = Zone_Affichage.width - marge_right - marge_left;
-                     info_theImage.height = Zone_Affichage.height;
+                     new_width = Zone_Affichage.width - (info_theImage.borderwidth.right + info_theImage.borderwidth.left);
+
+
 
                      Zone_Affichage.height += info_pamoorama_footer.height;
-
-
                      zoom = info_theImage.height / img_height;
                      myPamoorama.options.width = new_width * zoom;
-
-
                      //  if(msie || safari) jQuery("#pamoorama_inner ").css({ zoom: zoom });
                      //====================================================
@@ -771 +763 @@
                          marginLeft: "auto",
                          marginRight: "auto",
-                  //       height: Zone_Affichage.height + "px", sinon déclenchement panorama sur la hauteur;
+                         //height: Zone_Affichage.height + "px", sinon déclenchement panorama sur la hauteur;
                          width: new_width + "px"
                      });
@@ -782 +774 @@
 
                      jQuery("#pamoorama_outter").width(new_width);
+
+
                      // commenter sinon outter augmente à chaque resize
-                   //  jQuery("#pamoorama_outter").height(info_pamoorama.height - info_pamoorama_footer.height);
+                     //  jQuery("#pamoorama_outter").height(info_pamoorama.height - info_pamoorama_footer.height);
 
 
 
                      jQuery("#pamoorama_outter").css({ width: new_width + "px" });
+                     jQuery("#pamoorama_footer").css({ width: new_width + "px" });
                      //     
                      //====================================================
@@ -851 +846 @@
                      } else if (theme.match(RegExp("simple", "g"))) {
 
-                         jQuery("#imageToolBar").css("position", "static");
+                         jQuery("#imageToolBar").css({ position: "static" });
+                         
                          info_imageInfoBar = jQuery("#imageInfoBar").infos();
                          if (info_imageInfoBar.bottom < info_img.bottom) {
-                             jQuery("#imageInfoBar").height(info_img.bottom);
+                          //   jQuery("#imageInfoBar").height(info_img.bottom);
                          }
 
@@ -892 +888 @@
                      }
                      //   jQuery(Cadre).css("border", "solid green");
-                     margins = jQuery(Cadre).css("margin");
+                     margins = info_frame.margin.margin;
                      jQuery("#Debug5").css({ background: "transparent",
                          position: pos,
                          border: "green solid 2px",
                          textAlign: align_auto,
-                         margin: "4px",
+                         margin: margins,
                          top: t1 + "px",
                          left: l1 + "px",