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

Timestamp:

Apr 26, 2013, 1:51:34 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize update to piwigo 2.5 (fix bugs in admin )

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -1 @@
-// problème avec GMaps+diaporama:
+// problème avec GMaps+diaporama:
 // corriger   gmaps_pip.class.inc.php ajouter ligne 90 if ( !isset($_GET['slideshow']))
 //==============================================================  
@@ -218 +218 @@
 
           }
-          Zone_image.zoom = (Zone_image.image.height / Zone_image.image_init.height);
+          Zone_image.zoom = Zone_image.image.height / Zone_image.image_init.height;
           zoom_cl = parseInt(100 * Zone_image.zoom) + "%"; ;
           if (!Valid) {
@@ -448 +448 @@
         break;
       }
+    }
+    
+
+    if (jQuery("#derivativeCheckedSelMaxi").length == 0) {
+      m1 = '<span style="visibility: hidden;" id="derivativeCheckedSelMaxi" class="switchCheck">✔ </span>';
+      m1 += '<a style="visibility: visible;" href=""> SelMaxi<span class="derivativeSizeDetails"> (800 x 600)</span> </a><br>';
+      m1 += '<span style="visibility: hidden;" id="derivativeCheckedAutosize" class="switchCheck">✔ </span>';
+      m1 += '<a style="visibility: visible;" href=""> Autosize<span class="derivativeSizeDetails"> (800 x 600)</span> </a><br>';
+      jQuery("#derivativeSwitchBox").append(m1);
+
     }
     options.liste_type = new_liste;
@@ -1040 +1050 @@
           return;
         }
-        // jQuery(theImg).width(Zone_image.image_init.width);
-        for (n in options.liste_type) {
-          if (options.liste_type[n][0] == options.pictureSelType) {
-            Zone_image.image_init.height = options.liste_type[n][3];
-            Zone_image.image_init.width = options.liste_type[n][2];
-            break;
-          }
-        }
-
-
         jQuery(theImg).height(Zone_image.image_init.height);
         set_cl("no");
@@ -1115 +1115 @@
             if (img_objs.length > 0) {
               jQuery(img_objs).each(function (e) {
-             //   init_h1 = jQuery(this).height();
-             //   init_w1 = jQuery(this).width();
-              });  
+                //   init_h1 = jQuery(this).height();
+                //   init_w1 = jQuery(this).width();
+              });
             }
             dp1 = jQuery("#charlie").offset();
@@ -1134 +1134 @@
               w01 = Math.ceil(h01 * Zone_image.image.rapport);
             }
-            jQuery("#theMainImage").height(png_h );
+            jQuery("#theMainImage").height(png_h);
             jQuery("#theMainImage").width(w01 + wpng);
             jQuery("#theMainImage").css({ verticalAlign: "middle",
@@ -1153 +1153 @@
 
 
-       //     jQuery("#charlie object").attr("width", w01);
+            //     jQuery("#charlie object").attr("width", w01);
             jQuery("#charlie    object").attr("height", h01);
-        //    jQuery("#charlie embed").attr("width", w01); // firefox opera
+            //    jQuery("#charlie embed").attr("width", w01); // firefox opera
             jQuery("#charlie embed").attr("height", h01);
             jQuery("#charlie  embed").css("margin", "auto");
@@ -1434 +1434 @@
         options.pictureDeriv = last_id;
 
-        return { url: pt[n][1], pictureDeriv: last_id, pictureMap: last_id, width: pt[n][2], height: pt[n][3] };
+        return { url: pt[n][1], pictureDeriv: last_id, pictureMap: last_id, width: parseInt(pt[n][2]), height: parseInt(pt[n][3]) };
       }
       return { imgSrc: "", pictureDeriv: "", width: "", height: "" };
@@ -1445 +1445 @@
     Select_Image = function () {
       memoire = options.imgSrc;
-      if (options.imgSrc.match(RegExp("gif", "gi")))
+      if (options.imgSrc.match(RegExp(".gif", "gi")))
         return;
       var pt = options.liste_type;
@@ -1476 +1476 @@
           return;
         }
-        Zone_image.zoom = Math.ceil(Zone_image.image.height / Zone_image.image_init.height);
+        Zone_image.zoom = Zone_image.image.height / Zone_image.image_init.height;
         if (!theImg.src)
           return true;
@@ -1942 +1942 @@
         }
 
-        marges_llgbo = options.marges_llgbo;
+        marges_llgbo = options.marges_llgbo; // 48 !
       }
 
@@ -2211 +2211 @@
     // ==========================================================
 
-  });                                                 // ready
+  });                                                         // ready
   jQuery("#derivativeSwitchBox a").click(function (e) {
     k1 = 0;