Changeset 19859

Timestamp:

Jan 5, 2013, 6:28:07 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix bug crop

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (1 diff)
• js/Affiche_script.js (modified) (10 diffs)

extensions/Autosize/autosize.inc.php

@@ -421 +421 @@
         echo $set_var ;       
         echo $autoscript;       
-  //      self::Fin_php("#411: ".$DEBUG_autosize);
+        if (!isset($_COOKIE['autosize_reload'])  ){  
+            self::Fin_php("#424: ".$DEBUG_autosize);
+    }  
+  //     
        
 }

extensions/Autosize/js/Affiche_script.js

@@ -835 +835 @@
         if (this.name) {
           options.pictureSelType = this.name;
-          n = Get_dimensions(true, options);
+          // n = Get_dimensions(true, options);
         } else {
 
@@ -904 +904 @@
           return;
         }
-        jQuery(theImg).width(Zone_image.image_init.width);
+        //  jQuery(theImg).width(Zone_image.image_init.width);
         jQuery(theImg).height(Zone_image.image_init.height);
         set_cl("no");
@@ -916 +916 @@
         img_finale = { width: Zone_image.image.width, height: Zone_image.image.height };
       }
-      r1 = Zone_image.image.width / Zone_image.image.height;
+
       //======================================================
 
@@ -943 +943 @@
 
         //jQuery(theMainImage_id).height(Zone_image.image.height);
-        } else if (Type_Img == "panorama") {
-         // jQuery("#pamoorama").width(img_finale.width);
-         // jQuery("#pamoorama").height(img_finale.height);
-
-           
-      
-     //   jQuery("#theImage img.simple_panorama").panorama(asp_options);
+      } else if (Type_Img == "panorama") {
+        // jQuery("#pamoorama").width(img_finale.width);
+        // jQuery("#pamoorama").height(img_finale.height);
+
+
+
+        //   jQuery("#theImage img.simple_panorama").panorama(asp_options);
       } else {
         if (options.imageAutosize == false)
           if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
             jQuery(theMainImage_id).height(Zone_image.image.height);
-            jQuery(theMainImage_id).width(Zone_image.image.width);
-
+            r1 = infos_theImage.width / infos_theImage.height;
+            // jQuery(theMainImage_id).width(Zone_image.image.width/r1);
             jQuery(theMainImage_id).css("margin-top", options.marge_haute);
+
 
           } else {
@@ -1032 +1033 @@
     ******************/
     changeImgSrc = function (url, typeSave, typeMap, type) {
-
+      if (type == "Autosize" || type == "SelMaxi") {
+
+      }
       if (COOKIE_PATH == type) {
         type = options.pictureSelType;
@@ -1048 +1051 @@
 
       url_old = jQuery("#theMainImage").attr("src");
-      if (url != url_old) {
-        jQuery("#theMainImage").attr("src", url);
-      }
+
       jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
       if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
@@ -1060 +1061 @@
         jQuery.cookie('picture_sel_type', typeSave, { path: COOKIE_PATH });
       }
-
+      if (url != url_old) {
+        jQuery("#theMainImage").attr("src", url);
+      }
       // jQuery("#theMainImage," + theMainImage_id + ",.preload, .next1 , ")
       jQuery("#theMainImage").removeAttr("width height")
@@ -1136 +1139 @@
     *      pamoorama
     ******************************/
-   
-   
+
+
     jQuery("#pamoorama").bind("on", function () { alert($(this).text()); });
     jQuery("#pamoorama").bind("on", function (e) {
@@ -1326 +1329 @@
       }
       name_src = theImg.src;
+      stx = name_src.match(RegExp(Zone_image.src, "gi"));
+      if (stx == null) {
+        return false;
+      }
       img_init = { width: jQuery(theImg).width(), height: jQuery(theImg).height() }
 
@@ -2286 +2293 @@
 
 
-  });                                                                                                                   // ready
+  });                                                                                                                       // ready