Changeset 18944

Timestamp:

Nov 5, 2012, 8:39:40 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (charlie's,Embedded Videos)

Location:

extensions/Autosize/js

Files:

• Affiche_script.js (modified) (11 diffs)
• autosize_ajax.js (modified) (2 diffs)

extensions/Autosize/js/Affiche_script.js

@@ -129 +129 @@
         frm1 = jQuery("#theImage" + " " + type_src).get(0);
         Type_Img = "iframe";
-
         //'fb - xfbml - like - button
-
         objs = jQuery("#theImage" + " div").get(0);
         if (jQuery(objs).length > 0) {
@@ -141 +139 @@
               jQuery(frm1).attr("id", "charlie");
             } else {
-              Type_Img = "img";
+              //  Type_Img = "img";
             }
           }
         } else {
           jQuery(frm1).attr("id", "iframe");
+          jQuery(frm1).wrap('<div id="' + "theMainImage" + '" style="border:1px solid Transparent" />');
         }
 
@@ -320 +319 @@
 
           infos_theMainImage = jQuery("#iframe").infos(true);
-          theMainImage_id = "iframe";
+
           options.valide = true;
 
@@ -868 +867 @@
 
 
-        if (Type_Img == "charlie" || Type_Img == "iframe") {
+          if (Type_Img == "charlie" || Type_Img == "iframe") {
+            jQuery("#" + "theMainImage_obj").attr("width",Zone_image.image.width);
+             jQuery("#" + "theMainImage_obj").attr("height",Zone_image.image.height);
+          jQuery("#" + Type_Img).attr("width",Zone_image.image.width);
+          jQuery("#" + Type_Img).attr("height",Zone_image.image.height);
           swfobj = jQuery("#" + Type_Img).infos({ absolute: true });
 
@@ -911 +914 @@
         document.cookie = 'picture_sel_type=' + type + ';path=' + COOKIE_PATH;
       } else {
-     
+
         jQuery('#derivativeChecked' + typeSave).css('visibility', 'visible');
         document.cookie = 'picture_sel_type=' + typeSave + ';path=' + COOKIE_PATH;
@@ -1262 +1265 @@
           vn = this;
           size_derive = { w: parseInt(vn[2]), h: parseInt(vn[3]) };
-          if (vn[0] == options.pictureSelType || vn[0] == "Original" ) {
+          if (vn[0] == options.pictureSelType || vn[0] == "Original") {
             maxi_size = size_derive;
             maxi_size.idx = n;
@@ -1371 +1374 @@
         identique = Zone_image.src.match(RegExp(imgSrc, "gi"));
         if (identique) return;
-        href_path = "javascript:changeImgSrc('" + imgSrc + IMg.pictureDeriv + "', '"+ "', '" + IMg.pictureMap + "', '"  + options.pictureSelType + "')";
+        href_path = "javascript:changeImgSrc('" + imgSrc + IMg.pictureDeriv + "', '" + "', '" + IMg.pictureMap + "', '" + options.pictureSelType + "')";
         jQuery(".linkAutosize").attr("href", href_path);
         theImg = document.getElementById(theMainImage_id.replace("#", ""));
@@ -1683 +1686 @@
       options.theImageLeft = new_dim.left;
       options.theImageRight = (new_win.width - new_dim.right);
+      options.marge_bottom = Math.ceil(new_dim.out.bottom - new_img.out.bottom);
+      if (Type_Img == "iframe") { }
+      new_dim.out.bottom = new_win.height - options.marge_bottom;
+
       options.theImageBottom = new_win.height - new_dim.out.bottom;
       options.marge_top = Math.ceil(new_img.top - new_dim.top);
-      options.marge_bottom = Math.ceil(new_dim.out.bottom - new_img.out.bottom);
+
       if (options.theImageBottom < 0) {
         options.theImageBottom = 0;
@@ -1694 +1701 @@
       if (chk == "") { return; }
 
-      if (Type_Img != "map")
+      if (Type_Img != "map" && Type_Img != "iframe")
         Select_Image();
       infos_theMainImage = jQuery(theMainImage_id).infos({ absolute: true });
@@ -1767 +1774 @@
           Zone_image.image.width = options.theImageWidth;
           Zone_image.image.height = options.theImageHeight;
+          Zone_image.zoom = 1;
           break
         case "pamoorama":
@@ -2120 +2128 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              // ready
 
 

extensions/Autosize/js/autosize_ajax.js

@@ -18 +18 @@
   function progress(success,data) {
     if (success) {
-       jQuery("#theMainImage").trigger("ON", [{ nb: derivatives.total - derivatives.done, total: derivatives.total, done: derivatives.done,status:"ok",src:data.url,Width:data.Width,Height:data.Height}]);
+      try {
+        jQuery("#theMainImage").trigger("ON", [{ nb: derivatives.total - derivatives.done, total: derivatives.total, done: derivatives.done, status: "ok", src: data.url, Width: data.Width, Height: data.Height}]);
+      } catch (e) {
+
+      }
     } else {
 
@@ -81 +85 @@
                 j = derivatives.done;
                 derivatives.done++;
-                for (var j = 0; j < params.src.length; j++) {
-                  if (data.url.match(params.src[j])) {
-                    params.src[j] = ""; break;
+                try {
+                  for (var j = 0; j < params.src.length; j++) {
+                    if (data.url.match(params.src[j])) {
+                      params.src[j] = ""; break;
+                    }
                   }
+                  data.Width = Width;
+                  data.Height = Height;
+                } catch (e) {
+
                 }
-                data.Width = Width;
-                data.Height = Height;
                 progress(true, data);
               }),