Changeset 7355

Timestamp:

Oct 23, 2010, 7:21:37 PM (14 years ago)

Author:

cljosse

Message:

[Autosize][beta] fix bug on "height page".

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (14 diffs)
• main.inc.php (modified) (1 diff)

extensions/Autosize/js/Affiche_script.js

@@ -121 +121 @@
               */
 
-
               if (info_theImage.position == "absolute") {
                   var Bandeau = info_theImage.top -
@@ -206 +205 @@
                   info_description.bottom = info_description.top = 1;
 
-              info_description.top += Bandeau_t.marge_top;
+              var llgboframe = jQuery("#gbo div:first");
+              var marges_llgbo = 0;
+              if (llgboframe.length > 0) {
+
+                  marges_llgbo = jQuery(llgboframe).outerWidth() - jQuery("#gbo div:last").outerWidth();
+              }
+              if (theme.match(RegExp("gally", "g"))) {
+                  marges_llgbo = 0;
+              }
+
+              info_description.top += Bandeau_t.marge_top - marges_llgbo;
               // info_description.bottom 739 ;
               //  info_description.height 277 ;
               //      info_description.top 465 
-              info_description.height = (info_description.bottom + Info_the_page.top) - info_description.top;
+              info_description.height = marges_llgbo + (info_description.bottom + Info_the_page.top) - info_description.top;
+             
               if (check_desc_v != 'checked="checked"') {
                   info_description.height = 0;
@@ -320 +330 @@
           var Bandeau_bas = Info_description("theImage");
 
-          var init_taille_thumblink = { height: 0, width: 0 };
-          if (init_taille_thumblink.height == 0)
-              init_taille_thumblink = {
-                  height: jQuery(".thumbLink").height(),
-                  width: jQuery(".thumbLink").width()
-              };
           //=================================================================== 
 
@@ -579 +583 @@
 
               //=============== Vérification taille minimale  autorizée ======================
-              miniWidth = Get_Val_int(jQuery(TheImg).css("min-width"), mini_width);
+              var miniWidth = Get_Val_int(jQuery(TheImg).css("min-width"), mini_width);
               miniHeight = Get_Val_int(jQuery(TheImg).css("min-height"), mini_height);
 
@@ -621 +625 @@
               zone_affichage.height = winheight - marge_top;
 
-
-
-              //===========================================================================  
-              var sel0 = { top: 0 };
-
-
-
-
-
               //==================================================================================
               jQuery("#theImage #theImg IMG").css("marginTop", "0px")
 
-              var h = 15;
+              var h = 0;
               if (theme.match(RegExp("sobre", "g"))) {
                   h += 0; //??
@@ -678 +673 @@
               //=============================================================
               var height_user = eval(user_status + "_height");
-
-
               var reg1 = new RegExp("%", "g");
               if (height_user.match(reg1))
@@ -685 +678 @@
               else
                   Image_height = parseInt(height_user);
-
-              //============================================================
+             
               echelle_max = parseFloat(echelle_max, '3');
               var echelle = parseFloat(Image_height / img_reelle.height, 3);
@@ -692 +684 @@
               if (echelle > echelle_max) { echelle = echelle_max; }
               Image_height = parseInt(img_reelle.height * echelle);
+              //============================================================
 
               var Image_width;
               if (rapport > 0)
                   Image_width = parseInt(Image_height * rapport);
-
               else if (Type_Img == "map") {
                   Image_width = zone_affichage.width - marge_left - marge_right;
-
-                  if (theme.match(RegExp("gally", "g"))) {
-                      //  Image_height -= "30";
-                  }
-
-              } else {
+                 } else {
                   Image_width = zone_affichage.width;
               }
@@ -721 +708 @@
                   if (width_user.match(reg1))
                   // pourcentage
-                      widthmin = maxWidth * parseInt(width_user) / 100;
+                      widthmin = widthmin * parseInt(width_user) / 100;
                   else
                       widthmin = parseInt(width_user);
@@ -727 +714 @@
                   widthmin -= Get_Val_int(info_img.borderwidth.left);
                   widthmin -= Get_Val_int(info_img.borderwidth.right);
-
-
-
                   if (Image_width > widthmin) {
                       //   Image_width largeur à atteindre 
                       //  Calcul du rapport d'agrandissement 
-                      var echelle_w = parseFloat((widthmin  ) / img_reelle.width, 3);
+                      var echelle_w = parseFloat((widthmin) / img_reelle.width, 3);
                       if (echelle_w > echelle_max) { echelle_w = echelle_max; }
                       Image_width = parseInt(img_reelle.width * echelle_w);
@@ -819 +803 @@
 
               //=========================================================
-              //     jQuery(Cadre).css("position", "relative");
 
               jQuery(Cadre).css("top", "0px");
@@ -825 +808 @@
               jQuery("#comments").css("top", 0 + "px");
 
-
-              //jQuery("#copyright").css("top", 0 + "px");
-
-
-              jQuery("#linkNext").height(Image_height);
-              jQuery("#linkPrev").height(Image_height);
               //================ Zone affichage =========================
               //  Image_height, Image_width = valeur a atteindre.
@@ -942 +919 @@
                   if (theme.match(RegExp("gally", "g"))) {
 
-                      jQuery("#navThumbNext").height(init_taille_thumblink.height * 2);
-                      jQuery("#navThumbPrev").height(init_taille_thumblink.height * 2);
-
-                      jQuery(".thumbLink").css("height", init_taille_thumblink.height + "px");
-                      jQuery(".thumbLink").css("width", init_taille_thumblink.width + "px");
-
-                      jQuery(Cadre).height(zone_affichage.height);
 
                   } else {
@@ -973 +943 @@
 
       } // function
-);                                                                                                                                                                                                                                                                                                         // ready
+);                                                                                                                                                                                                                                                                                                            // ready
     /*
 *

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 1.2.4
+Version: 1.2.5
 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