Changeset 18325 for extensions/Autosize/js

Timestamp:

Sep 28, 2012, 11:13:50 AM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, add theme directive

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -9 +9 @@
 
   jQuery(document).ready(function (jQuery) {
-
-
-
-
     var Type_Img;
     var theImg;
@@ -71 +67 @@
       } else if (jQuery("#Panorama").length) {
         Type_Img = "panorama";
+
       } else if (jQuery("#pamoorama").length) {
         Type_Img = "pamoorama";
+        options.valide = true;
+
       } else if (jQuery("#map").length) {
         Type_Img = "map";
@@ -276 +275 @@
           infos_theMainImage = jQuery("#pamoorama").infos(true);
           theMainImage_id = "#pamoorama";
+          options.valide = true;
 
         } else {
@@ -311 +311 @@
 
       jQuery("#loading").show(0);
-      zheight = infos_window.height - (infos_theImage.top);
+      if (infos_theImage.top > infos_window.height) {
+        zheight = infos_window.height - infos_content.top;
+      } else {
+        zheight = infos_window.height - (infos_theImage.top);
+      }
       h01 = 0;
       h02 = 0;
@@ -332 +336 @@
 
         } else {
-          options.marge_basse += Math.max(h01, h02);
+          if (test_theme("stripped")) {
+
+          } else
+            options.marge_basse += Math.max(h01, h02);
+
           if (test_theme("blanc , pure, hr_ ")) {
             options.marge_gauche += 10;
@@ -363 +371 @@
         jQuery(theImage_id).width(Zone_image.container.width);
         jQuery(theImage_id).height(Zone_image.container.height);
+
       }
 
@@ -369 +378 @@
       ***********************************************************/
       jQuery(window).resize(function (event, ui) {
+        if (!options.valide) {
+          jQuery("#loading").hide(fade_in);
+          return true;
+        }
+
         infos_window = jQuery(window).infos();
         infos_imageInfos = jQuery("#imageInfos").infos(true);
         old_w = infos_theImage.width;
         infos_theImage = jQuery(theImage_id).infos(true);
-        if (options.set_sw) {
-          if (Type_Img == "pamoorama") {
-            if (options.set_sw == "menuSwitcher") {
-
-            } else {
-              p_width = jQuery(theImage_id).width();
-            }
-            if (infos_imageInfos.visible)
-              p_width = infos_window.width - infos_theImage.left - infos_imageInfos.width - 20;
-            else
-              p_width = infos_window.width - infos_theImage.left - 20;
-            jQuery(theImage_id).width(p_width);
-            infos_theImage = jQuery(theImage_id).infos(true);
-
-
-          }
-        }
-
         if (test_theme("simple")) {
           jQuery(theMainImage_id).css({ maxWidth: "none" });
@@ -421 +417 @@
 
         jQuery(theImage_id).height(Zone_image.container.height + 2);
-
-
-
-
-        if (DEBUG_autosize == "no") return;
-
-        Autosize_resize(true, options);
+        if (options.valide && DEBUG_autosize != "no") {
+
+          Autosize_resize(true, options);
+        }
         jQuery("#loading").hide(fade_in);
       });
@@ -443 +436 @@
       marges_llgbo = 0;
       //========================================================================================== 
-
-      init_gen();
-      jQuery(window).resize();
-      jQuery(window).resize();
-
+      if (options.valide) {
+
+        init_gen();
+        jQuery(window).resize();
+        jQuery(window).resize();
+
+      }
+      jQuery("#loading").hide(fade_in);
     });
     //__________________window.onload_________________
@@ -509 +505 @@
     }
 
-    jQuery("#form_autosize_picture").addClass("Autosize_margin");
+    jQuery("#form_autosize_picture").addClass("Autosize");
     //===== marges suplémentaires en fonction theme ===
-    options.valide = jQuery(".Autosize_margin").css("display");
-    options.marge_haute = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("top"));
-    options.marge_basse = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("bottom"));
-    options.marge_gauche = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("left"));
-    options.marge_droite = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("right"));
+    options.valide = jQuery(".Autosize").css("display") != "none";
+
+    options.marge_haute = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("top"));
+    options.marge_basse = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("bottom"));
+    options.marge_gauche = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("left"));
+    options.marge_droite = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("right"));
     fade_in = options.fade_in || 0;
     imageComment_id = ".imageComment";
@@ -558 +555 @@
         pictureDeriv_maxi = pictureDeriv;
     }
-
+    if (!options.valide) {
+
+      pictureDeriv = "medium";
+      pictureDeriv_maxi = pictureDeriv;
+      cookies.pictureDeriv = pictureDeriv;
+      jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
+      jQuery('#derivativeChecked' + options.pictureDeriv).css('visibility', 'visible');
+      jQuery('#derivativeCheckedSelMaxi').hide();
+      jQuery('#derivativeCheckedSelMaxi').next().hide();
+      jQuery('#derivativeCheckedSelMaxi').next().next().hide();
+      jQuery('#derivativeCheckedAutosize').hide();
+      jQuery('#derivativeCheckedAutosize').next().hide();
+      jQuery('#derivativeCheckedAutosize').next().next().hide();
+    }
 
     if (DEBUG_autosize == "no") return;
@@ -882 +892 @@
     ***************************/
     Autosize_resize = function (force, parametres) {
+      sav_container = Zone_image.container;
       if (Get_dimensions(force, parametres)) {
         jQuery(theImageAndInfos_id).css({ height: "auto" });
+        jQuery(theMainImage_id).removeAttr("width");
+        jQuery(theMainImage_id).removeAttr("height");
+
         if (Type_Img == "pamoorama") {
-          Set_Pamoorama({ width: Zone_image.container.width, height: Zone_image.image.height });
+          Set_Pamoorama({ width: Zone_image.container.width, height: Zone_image.container.height });
           if (nopano)
             if (window.myPamoorama.options.autoscrollOnLoad) {
               window.myPamoorama.startAnimRight();
             }
-        } else {
-
-          jQuery(theMainImage_id).height(Zone_image.image.height);
+          } else {
+
+          if (!options.slideshow) { jQuery(theMainImage_id).height(Zone_image.image.height); };
           jQuery(theMainImage_id).width(Zone_image.image.width);
-
-          if (test_theme("xxxxxxx")) {
-            jQuery(theImage_id).css({ height: "auto" });
-            jQuery(theImage_id).height(Zone_image.image.height + Zone_image.marges.height);
-            jQuery(theImage_id).width(Zone_image.image.width + Zone_image.marges.width);
-
-          }
+          
+
         }
 
@@ -906 +915 @@
         set_cl(true);
       } else {
-        //   jQuery(theImage_id).height(Zone_image.image.height + Zone_image.marges.height);
+
         Set_Pamoorama({ width: Zone_image.container.width, height: Zone_image.image.height });
         set_cl(false);
@@ -1356 +1365 @@
 
         if (options.select_type != "SelMaxi" && options.select_type != "Autosize") {
-         
-           IMg = Get_Maxi(Zone_image.image_init);
+
+          IMg = Get_Maxi(Zone_image.image_init);
         } else {
           IMg = Get_Maxi(Zone_image.image);
@@ -1481 +1490 @@
 
         //---------- test largeur image 
-        new_width = Format.width;
+        new_width = Format.width - (options.marge_right + options.marge_left);
 
         if (new_width > new_image.width) {
@@ -1715 +1724 @@
 
       if (options.imageAutosize) {
-        return; //stripped
+        return true; //stripped
       }
 
@@ -1992 +2001 @@
     //_______________________ init_gen _______________________
 
-  });                                                                                                                                                                                                                                                      // ready
+  });                                                                                                                                                                                                                                                                         // ready