Changeset 22219 for extensions/Autosize

Timestamp:

Apr 15, 2013, 3:32:36 PM (11 years ago)

Author:

cljosse

Message:

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

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -525 +525 @@
     var infos_theImageAndInfos = jQuery(theImageAndInfos_id).infos();  // Cadre
     // general  
-    var infos_content=jQuery("#content").infos(true);
+    var infos_content = jQuery("#content").infos(true);
     var infos_the_page = jQuery("#the_page").infos(true);
     var nopano = false;
@@ -808 +808 @@
           spans = jQuery("#derivativeChecked" + this.name).next();
           if (retour.pictureSelType != this.name)
-            spans.attr("href", "javascript:" + "ChangeImgSrc('" + retour.source + "," + retour.pictureDeriv + "," + retour.pictureMap + "," + this.name + "')");
+            spans.attr("href", "javascript:" +
+                        "ChangeImgSrc('" + retour.source + "," +
+                        retour.pictureDeriv + "," +
+                        retour.pictureMap + "," + options.COOKIE_PATH + "')");
         }
         options.pictureSelType = retour.pictureSelType;
@@ -1373 +1376 @@
           Zone_image.path = " ";
 
-        identique = Zone_image.src.match(RegExp(imgSrc.replace("./", ""), "gi"));
+
+        imgSrcS = imgSrc.split('/');
+        imgSrcS = imgSrcS[imgSrcS.length - 1];
+        identique = theImg.src.match(RegExp(imgSrc, "gi"));
+        if (identique) 
+           identique = theImg.src.match(RegExp("loadajax", "gi")) ;
         if (identique) return true;
         href_path = get_href(IMg.pictureDeriv);
@@ -1388 +1396 @@
           last_id = IMg.pictureDeriv;
           // eval(href_path);
-          changeImgSrc(imgSrc.replace("./", ""), last_id, IMg.pictureMap, options.pictureSelType);
+          data_src = jQuery(theImg).attr("data-src");
+          if (typeof data_src != "undefined") {
+            changeImgSrc(data_src + "&loadajax=true",
+           last_id,
+           IMg.pictureMap,
+           options.COOKIE_PATH);
+          } else {
+            changeImgSrc(imgSrc.replace("./", ""),
+           last_id,
+           IMg.pictureMap,
+           options.COOKIE_PATH);
+          }
         }
         theImg.useMap = "#map" + IMg.pictureMap;
@@ -2164 +2183 @@
     } // Debug_pos
     // ==========================================================
-  });                                                                                                                                                               // ready
+  });                                                                                                                                                                  // ready
   jQuery("#derivativeSwitchBox a").click(function (e) {
     k1 = 0;