Changeset 12660 for extensions

Timestamp:

Nov 27, 2011, 1:06:59 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with theme hr_os_xl

Location:

extensions/Autosize/js

Files:

• Affiche_script.js (modified) (8 diffs)
• conflit.js (modified) (1 diff)

extensions/Autosize/js/Affiche_script.js

@@ -760 +760 @@
              case "embed":
                //
-
+               if (info_img.width == 0)
+                 info_img = jQuery("#thePicturePage").infos();
+               if (info_img.width == 0)
+                 info_img = jQuery("#the_page").infos();
                info_theImage = info_img;
                info_the_page = jQuery("#the_page").infos();
+               Bandeau_bas.height = Bandeau_bas.top;
+
+               iph1 = jQuery("#theImage div").infos();
+               if ((winheight - iph1.bottom)>0)
+               Bandeau_bas.height =(winheight - iph1.bottom) + 50;
+               else
+               Bandeau_bas.height = 50;
+
 
                if (rapport < 0) {
                  img_height = info_img.height;
                  img_width = info_img.width;
-
                  img_reelle.height = img_height;
                  img_reelle.width = img_width;
-
                }
 
                break
              case "charlie":
-
-
                info_theImage = info_img;
                info_the_page = jQuery("#the_page").infos();
@@ -787 +794 @@
                }
                break
+
+
              case "pamoorama":
 
@@ -842 +851 @@
 
            img_reelle.width = parseInt(img_reelle.width);
-           // jQuery(Cadre).width(mini_width); 1.6.2
-
 
            if (img_reelle.width < mini_width) {
@@ -862 +869 @@
 
            if (rapport < 0) {
-
              img_init.height = parseInt(img_height);
              img_init.width = parseInt(img_width);
@@ -913 +919 @@
            } else if (theme.match(RegExp("gally", "g"))) {
              correction += 0; //??
-
+           } else if (theme.match(RegExp("os", "g"))) {
+             correction += 0; //??
            }
 
@@ -1112 +1119 @@
            img_finale.width = parseInt(img_finale.width);
            //=========================================================================
-
            //=== cadre = theImage
            jQuery(Cadre).css({ marginLeft: "auto" });
+           if (theme.match(RegExp("sobre", "gi")) || theme.match(RegExp("hr_", "gi")) || theme.match(RegExp("Mont", "gi"))) {
+             jQuery(Cadre).css("width", "auto");
+           } else {
            jQuery(Cadre).width(Zone_Affichage.width); //centrer simple black
-           // jQuery(Cadre).css("width", "auto");
+
+           }
+           // ;
 
            if (Type_Img == "panorama" || Type_Img == "pamoorama") {
@@ -1360 +1371 @@
            }
            zoom = img_finale.height / img_height;
+           h0 = jQuery("#content").height();
+           if (h0 == null) {
+             h0 = winheight - Zone_Affichage.top;
+           }
+           h1 = (h0 - img_finale.height) / 2;
+           //  jQuery(Parent).css({ marginTop: h1 + "px" });
 
            zoom = parseInt(zoom * 100);
@@ -1412 +1429 @@
              info_theImageBox = jQuery(Parent).infos(); //theImage
            }
-
            info_theImageBox.margin.margin = info_frame.margin.margin;
            info_theImageBox.top = t1;

extensions/Autosize/js/conflit.js

@@ -6 +6 @@
 //==============================================================================
 browser = detect_browser();
+image_w = 600;
+image_h = 400
+
 function detect_browser() {