Changeset 12773 for extensions/Autosize

Timestamp:

Dec 21, 2011, 8:32:39 AM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix bug compatibility with charlie, facebook, iframe, and rvmap

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -1120 +1120 @@
            //=========================================================================
            //=== cadre = theImage
-           jQuery(Cadre).css({ marginLeft: "auto" });
            if (theme.match(RegExp("simple", "gi"))) {
              jQuery(Cadre).width(Zone_Affichage.width); //centrer simple black
+             jQuery(Cadre).css({ width: Zone_Affichage.width + "px",
+               marginLeft: "auto"
+             });
+
            } else if (theme.match(RegExp("sobre", "gi")) || theme.match(RegExp("hr_", "gi")) || theme.match(RegExp("Mont", "gi"))) {
-             jQuery(Cadre).css("width", "auto");
+             jQuery(Cadre).css({ width: "auto", marginLeft: "auto" });
+           } else if (theme.match(RegExp("saruka", "gi"))) {
+
+             jQuery(Cadre).css({ width: Zone_Affichage.width + "px" });
+
            } else {
              jQuery(Cadre).css("width", "auto");
@@ -1188 +1195 @@
 
                jQuery("embed").css({ width: img_finale.width + "px",
-                                    height: img_finale.height + "px" });
+                 height: img_finale.height + "px"
+               });
                jQuery("object").css({ width: img_finale.width + "px",
                                     height: img_finale.height + "px"
@@ -1602 +1610 @@
     } else if (jQuery("#pamoorama").length) {
         Type_Img = "pamoorama";
-
+     } else if (jQuery("#map").length) {
+        Type_Img = "map";
+     } else if (jQuery("#Panorama").length) {
+        Type_Img = "panorama";
     } else if (jQuery(Parent + " object").length > 0) {
         Type_Img = "charlie";
@@ -1620 +1631 @@
 
       } else if (jQuery(Parent + " iframe").length > 0) {
+
         Type_Img = "charlie";
-        if (jQuery(Parent + " div").length > 0)
-          jQuery(Parent + " div").attr("id", "charlie");
-        else
-          jQuery(Parent + " iframe").attr("id", "charlie");
+
+        //'fb - xfbml - like - button
+        nbf = jQuery(Parent + " iframe").length;
+        frm1 = jQuery(Parent + " iframe").get(0) ;
+        objs = jQuery(Parent + " div").get(0);
+        if (jQuery(objs).length > 0) {
+          id_0 = jQuery(objs).attr("id");     
+        if (id_0 == "") {
+          jQuery(objs).attr("id", "charlie");
+        } else {
+          if (nbf > 1) {
+            jQuery(frm1).attr("id", "charlie");
+          } else {
+            Type_Img = "img";
+          }           
+        }
+        } else {
+         jQuery(frm1).attr("id", "charlie");
+        }
         type_src = "iframe";
 
-    } else if (jQuery("#map").length) {
-        Type_Img = "map";
-
-    } else if (jQuery("#Panorama").length) {
-        Type_Img = "panorama";
     } else if (jQuery(Parent).find("img").length > 0) {
         Type_Img = "img";