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

Timestamp:

Oct 23, 2012, 12:08:16 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (setup picture)

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -591 +591 @@
     theMainImage_st = false;
     jQuery("#theMainImage").error(function (e) {
-      jQuery(".infos").show();
-      // alert(this.src + ' Image does not exist !!');
-    });
-    $("#theMainImage").bind('ON', function (event, param1) {
-
-    });
-
-    jQuery("#theMainImage").live("ON", function (e, data) {
-      d = (new Date()).getTime();     
-      jQuery("#theMainImage").attr("src", this.src + "?" + data.total);
-  //    jQuery("#infos_succes").text(data.done + " / " + data.total);
       jQuery.noop();
-      if (data.nb == 0) {
-   //     jQuery(".infos").empty();
-   //     jQuery(".infos").remove();
-       if(typeof  imageInfos_id == "undefined") return ;
-
-        Autosize_resize(true, options);
-
-
-      }
-      // alert(this.src + ' Image does not exist !!');
+    });
+    jQuery("#theMainImage").bind("ON", function (e, data) {
+      if (!data.status != "ok") {
+        return;
+      }
+
+      if (data.done == 1)
+        jQuery("#theMainImage").attr("src", nofile[data.done].file);
+      jQuery.noop();
+
+    });
+    jQuery("#theMainImage").bind("Finish", function (e, data) {
+
+      jQuery("#theMainImage").attr("src", nofile[1].file);
+      if (typeof imageInfos_id == "undefined") return;
+      Autosize_resize(true, options);
+
     });
 
@@ -909 +905 @@
     + " IMG: " + img_finale.width
     + " X " + img_finale.height
+    + " mgw : " + Zone_image.marges.width
     , "->")
       });
@@ -1063 +1060 @@
     }
     //__________________ Wait_pamoorama ______________________
+    jQuery(".pwg-icon-clock-minus, .pwg-icon-clock-plus").click(function (i) {
+      n = window.myPamoorama;
+      n = this;
+    })
 
     Wait_pamoorama_time = function () {
@@ -1289 +1290 @@
     Select_Image = function () {
       var pt = options.liste_type;
+
+
       if (pt.length > 0) {
         //===== calcul Image ===
@@ -1295 +1298 @@
         options.theImageMargeZone = Zone_image.marges;
         if (Type_Img != 'charlie') {
-          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize") {
+          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize" && Type_Img != 'pamoorama') {
             IMg = Get_Maxi(Zone_image.image_init);
           } else {
@@ -1485 +1488 @@
 
       /****************************************/
-      if(typeof imageInfos_id == "undefined") return;
-      infos_imageInfos = jQuery(imageInfos_id).infos(true);             // information
-      infos_theMainImage = jQuery(theMainImage_id).infos(true);         // Image   
+      if (typeof imageInfos_id == "undefined") return;
+      infos_imageInfos = jQuery(imageInfos_id).infos({ absolute: true });             // information
+      infos_theMainImage = jQuery(theMainImage_id).infos({ absolute: true });         // Image   
       // commentContent
       // copyright 
+   
 
 
@@ -1498 +1502 @@
       infos_theImage = jQuery(theImage_id).infos(true);   // container 
       infos_window = jQuery(window).infos(true);   // window
+      w = infos_theImage.general.marges.width
 
       container = {
@@ -1559 +1564 @@
       //===============================================================
       retrait_img.width = Math.ceil(infos_theMainImage.general.marges.width); // borderwidth+padding
+      retrait_img.width = Math.ceil(infos_theImage.general.marges.width); // borderwidth+padding
       retrait_img.width += Math.ceil(options.marges_llgbo || 0);
       retrait_img.width += 2;
@@ -1588 +1594 @@
       } else if (Type_Img == "pamoorama") {
         if (height_theMainImage > container.height_interne) {
-
+          n = options.pictureSelType;
         }
       } else {
@@ -2133 +2139 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                              // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                      // ready