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

Timestamp:

Jan 18, 2011, 1:17:27 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] compatibility whith simple

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -52 +52 @@
 
 //==========================================================================
-function Wait_Affichage() { 
+function Wait_Affichage() {
+   
+            fade_in = parseInt(fade_in);
     if(!jQuery().newResize()) {
                  setTimeout("Wait_Affichage()", 500);
                  return
              }
-
-             fade_in = parseInt(fade_in);
-             if (fade_in == 0) {
-                 if (msie)
-                     jQuery(Parent).css({opacity:"1",filter: "alpha(opacity=100)"});
-             else
-                 jQuery(Parent).css("opacity","1");
-             } else {
-                 jQuery(Parent).animate(
-                         { opacity: 1 }, fade_in, "swing"
+  
+             if (fade_in == 0) {               
+                     jQuery(Parent).css({opacity:"1" });
+         } else {
+
+                jQuery(Parent).animate(
+                         { opacity: "1" }, fade_in, "swing"
                        , function (i) {
+                           jQuery(Parent).css({ opacity: "1" });
                            if (DEBUG == "true") {
                                bp1 = jQuery('.debug').get(nu_img);
@@ -85 +85 @@
 jQuery(document).ready(
      function (jQuery) {
+         jQuery(window).unload(function () {
+             
+
+
+         });
          jQuery(window).load(function () {
-             if (fade_in != 0) {
-                 if (msie)
-                     jQuery("#theImage").css({ opacity: "0" });
-                 else
-                     jQuery("#theImage").css({ opacity: "0" });
-             }
+
+             //  jQuery("#theImage").css({ opacity: "0" });
+
+             jQuery("#the_page").css({ top: "0px" });
+
              //======= cl_conflit ======
              img_top = "0";
              rapport = -1;
-
              marges_llgbo = 0;
              pos = 0;
-
-
              //=============================================================
              function cl_Timer() {
@@ -133 +134 @@
              img_finale = { height: 0, width: 0 };
              Zone_Affichage = { height: 0, width: 0 };
-
-             //============================================================
+             //============================================================        
 
              Info_the_page = jQuery("#the_page").infos();
@@ -150 +150 @@
              }
              old_window = { width: 0, height: 0 };
-             Wait_Affichage();
+             jQuery("#theImage").trigger('ON');
+
              old_window = { width: 0, height: 0 };
              jQuery().newResize();
@@ -255 +256 @@
                  var info_ToolBar = jQuery("#imageToolBar").infos();
                  var marge = 0;
-                 marge_right = 0;
-                 marge_left = 0;
+                 var marge_right = 0;
+                 var marge_left = 0;
                  if (theme.match(RegExp("simple", "g"))) {
                      if (info_ToolBar.width > 0)
@@ -263 +264 @@
                          marge = (Zone_Affichage.width - info_the_page.width) / 2;
 
-                     var marge_right = marge;
-                     var marge_left = marge;
+                     marge_right = marge;
+                     marge_left = marge;
 
                      if (info_content.width > 100) {
@@ -274 +275 @@
 
                      }
-                 }
-                 else
+                 } else {
+                     if (info_ToolBar.width > 0)
+                         marge = (info_the_page.width - info_ToolBar.width) / 2;
+
+                     marge_right = marge;
+                     marge_left = marge;
                      winwidth = info_the_page.width;
+                 }
 
 
@@ -328 +334 @@
                          jQuery("#map").css("left", info_map.width + "px");
                          Bandeau_bas.height = 10;
-                        
+
                          if (theme.match(RegExp("simple", "g"))) {
                              img_reelle.width = winwidth; //- info_map.width -marge_right;
-                         } else { 
-                          img_reelle.width = winwidth - info_map.width -marge_right;
+                         } else {
+                             img_reelle.width = winwidth - info_map.width - marge_right;
                          }
 
@@ -610 +616 @@
                          heightgbo = img_finale.height;
                          img_finale.width -= marges_llgbo;
-                         img_finale.height -= marges_llgbo;
+                         if (jQuery("#slideshow").infos().width > 0) {
+                             img_finale.height -= (marges_llgbo * 1.5);
+                         } else {
+                             img_finale.height -= marges_llgbo
+                         }
+
 
                          if (wingbo > winwidth) {
@@ -668 +679 @@
                  //================ Zone affichage =========================
 
-                 if (theme.match(RegExp("luciano", "g"))) {
-                     //---- information en dehors du cadre 
-                     jQuery(Cadre).height(Zone_Affichage.height -= Bandeau_bas.height);
-                 }
-
-                 //=========================================================
 
                  //  jQuery(Cadre).css("top", "0px");
@@ -683 +688 @@
                  Image_width = img_finale.width;
                  //=========================================================================
-                 jQuery(Cadre).css({ marginLeft: marge_left + "px"
-                 });
+                 if (jQuery("#slideshow").infos().width > 0) {
+
+                     jQuery(Cadre).css({ marginLeft: "auto"
+                     });
+                 }
+                 else
+                     jQuery(Cadre).css({ marginLeft: marge_left + "px"
+                     });
                  jQuery(Cadre).width(Zone_Affichage.width);
                  //   jQuery(Cadre).height(Zone_Affichage.height);
@@ -816 +827 @@
                  }
 
-
-
+                 jQuery("#imageContainer").css({ height: "auto" });
 
                  jQuery("#navThumbPrev").css({ overflow: "hidden" });
                  jQuery("#navThumbNext").css({ overflow: "hidden" });
                  n = typeof inittoolbar;
-
+                 if (Type_Img == "map") {
+                     jQuery("#navThumbNext").css({ display: 'none' });
+                     jQuery("#navThumbPrev").css({ display: 'none' });
+                 }
                  try {
                      if (theme.match(RegExp("gally", "gi"))) {
@@ -835 +848 @@
                                  top: info_img.top + 20 + "px", overflow: "hidden"
                              });
-                             if (Type_Img == "map")
-                                 jQuery("#navThumbPrevContainer").css({ background: 'none' });
+
                          }
                          if (jQuery("#navThumbNext").length > 0) {
@@ -844 +856 @@
 
                          }
-                         if (Type_Img == "map")
-                             jQuery("#navThumbNextContainer").css({ background: 'none' });
+
+
                          if (!theme.match(RegExp("lapis", "gi"))) {
-                             initializeImageMode("resize");
+                             if (typeof initializeImageMode == "function") {
+                                 initializeImageMode("resize");
+                             }
+
                          }
 
@@ -955 +970 @@
                  *
                  */
-                  
+
                  function Info_entete(Parent) {
                      if (typeof (marge_top) != "undefined") return result;
@@ -1022 +1037 @@
                      //=============================================================================
                      info_description = { top: 0, bottom: 0, height: 0 };
-            
-
+
+                     jQuery(Parent).css({ display: "block" });
                      //====== détection du type d'images ======
                      if (jQuery("#charlie").length > 0) {
@@ -1085 +1100 @@
                      if (theme.match(RegExp("luciano", "g"))) {
                          TheImg = jQuery(Parent + " #theImg img");
+
                          info_img = jQuery(TheImg).infos();
 
@@ -1242 +1258 @@
 
                      if (theme.match(RegExp("luciano", "g"))) {
-                         //info_description.bottom -= 30 
+                         info_description.bottom -= 0;
+
+                        
+                             correction = -30;
+                             Info_slidshowToolBar = jQuery("#slidshowToolBar").infos();
+
+                             if (Info_slidshowToolBar.height > 0) {
+                                 correction -= (Info_slidshowToolBar.height);
+                                 info_description.top -= 90;
+
+                             }
+                              
+                       
+
+                         //=========================================================
                      }
 
@@ -1336 +1366 @@
              Wait_Affichage();
          });
-
+         jQuery(Parent).live('ON', function (e) {
+             jQuery(jQuery('.debug').get(1)).trigger('ON');
+             Wait_Affichage();
+         });
 
          // Custom Event, ON to turn on a debug.