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

Timestamp:

Jun 19, 2011, 2:03:07 PM (13 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix bugs on height

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -258 +258 @@
        });
 
-       jQuery(window).resize(
-               function (event, ui) {
-                 List_autosize_resize(event, ui);
-                 jQuery().newResize();
-               });
+
 
        jQuery(window).load(function () {
          if (typeof img_width == "undefined") {
-
            if (List_autosize.length == 0) return;
            for (i = 0; i < List_autosize.length; i++) {
              Autosize_resize(jQuery(List_autosize[i]));
            }
-
            return;
          }
@@ -351 +345 @@
        //=========================================================
        old_window = { width: 0, height: 0 };
+       jQuery(window).resize(
+               function (event, ui) {
+                 List_autosize_resize(event, ui);
+                 jQuery().newResize();
+               });
 
        jQuery.fn.extend({
@@ -531 +530 @@
                info_theImage = jQuery(theImg).infos();
                info_the_page = jQuery("#the_page").infos();
+               jQuery("#theImage").height(info_theImage.height);
+               img_finale.height = info_theImage.height;
 
                break
@@ -596 +597 @@
                theImg = myPamoorama.image;
                info_theImage = jQuery("#pamoorama").infos();
-               info_theImage.height = img_reelle.height;
-
+               //img_finale.height = info_theImage.height;
+               //info_theImage.height = img_reelle.height;
+
+               info_theImage.height =info_theImage.height;
 
                info_the_page = jQuery("#the_page").infos();
@@ -714 +717 @@
            //==========================================================================
            h = 0;
+           Bandeau = 0;
 
            h = (Zone_Affichage.padding.bottom + Zone_Affichage.padding.top + Zone_Affichage.margin.top + Zone_Affichage.margin.bottom);
-           Bandeau = Bandeau_t.img_top;
+           if (typeof Bandeau_t != "undefined") Bandeau = Bandeau_t.img_top;
            Zone_Affichage.height = winheight - Bandeau - Marge_Basse - correction - h;
            //=========================================================================
@@ -782 +786 @@
              }
              widthmin -= marges;
-             widthmin -= (Bandeau_t.borderwidth.left + Bandeau_t.borderwidth.left);
-             Image_width -= (Bandeau_t.borderwidth.left + Bandeau_t.borderwidth.left);
+             if (typeof Bandeau_t != "undefined") {
+               widthmin -= (Bandeau_t.borderwidth.left + Bandeau_t.borderwidth.left);
+               Image_width -= (Bandeau_t.borderwidth.left + Bandeau_t.borderwidth.left);
+             } else {
+
+               jQuery().newResize();
+             }
              if (Image_width > widthmin) {
                //   Image_width largeur à atteindre
@@ -811 +820 @@
            }
            zoom = echelle;
-           if (llgboframe.height > 0) {
+           if (typeof (llgboframe) != "undefined" && llgboframe.height > 0) {
              //=============LLGBO2 ===========================
              t1 = llgboframe;
              if (!theImg.src) {
-               theImg = jQuery(theImg).find("img").get(0)
+               theImg = jQuery("#gbo").find("img").get(0)
                if (!theImg.src) {
                  theImg = jQuery(Parent).find("div").get(0)
@@ -889 +898 @@
                  jQuery("area[rel=next]").attr({ coords: "'" + coord.x0 + "," + coord.y0 + "," + coord.x1 + "," + coord.y1 + "'" });
                }
+               jQuery("#theImage").height(heightgbo + marges_llgbo / 2);
              }
            }
@@ -913 +923 @@
            // jQuery(Cadre).width(Zone_Affichage.width);
            jQuery(Cadre).css("width", "auto");
-           //   jQuery(Cadre).height(Zone_Affichage.height);
+           if (Type_Img == "panorama" || Type_Img == "pamoorama") 
+           img_finale.height = info_theImage.height;
+           Zone_Affichage.height = img_finale.height;
+           jQuery(Cadre).height(Zone_Affichage.height);
 
            if (typeof (gmaps) != "undefined") {
@@ -1040 +1053 @@
 
 
-           } else if (theImg.src) {
+           } else if (theImg != null && theImg.src) {
              //--- background ?? ---
              jQuery(theImg).height(img_finale.height);
@@ -1242 +1255 @@
 
 function Info_entete(Parent) {
-    if (typeof (marge_top) != "undefined") return result;
+
     info_imageToolBar = jQuery("#imageToolBar").infos();
-
+    if (typeof (marge_top) != "undefined") return info_imageToolBar;
 
     if (info_imageToolBar.position == "absolute") {
@@ -1301 +1314 @@
     llgboh2 = jQuery("#gboh2").infos();
     result.img_top += llgboh2.height;
+
     return result;