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

Timestamp:

Nov 4, 2012, 12:03:50 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (fix windowheigh...)

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -630 +630 @@
          .error(function (e) {
            if (!this.complete) {
-             src = jQuery(this).attr("src").replace("./_data/i/","",1);
+             src = jQuery(this).attr("src").replace("./_data/i/", "", 1);
              jQuery.ajax({
                type: 'GET',
-               url: 'i.php?' +  src + "&ajaxload=true",
+               url: 'i.php?' + src + "&ajaxload=true",
                dataType: 'json',
                success: (function (data) {
@@ -641 +641 @@
              });
 
-          
+
 
            }
@@ -648 +648 @@
          .bind("Finish", function (e, data) {
            if (typeof imageInfos_id == "undefined") return;
-          
+
          })
           .bind("ON", function (e, data) {
@@ -660 +660 @@
               return;
             }
-            if (data.src) { 
-             if (typeof imageInfos_id == "undefined") return;
-              if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {              
-             //   Autosize_resize(true, options);
+            if (data.src) {
+              if (typeof imageInfos_id == "undefined") return;
+              if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
+                //   Autosize_resize(true, options);
               }
             }
@@ -965 +965 @@
         //jQuery(theMainImage_id).height(Zone_image.image.height);
       } 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);
-
-        } else {
-          jQuery(theMainImage_id).height(Zone_image.image.height);
-          jQuery(theMainImage_id).width(Zone_image.image.width);
-        }
+        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);
+
+          } else {
+            jQuery(theMainImage_id).height(Zone_image.image.height);
+            jQuery(theMainImage_id).width(Zone_image.image.width);
+          }
 
 
@@ -1009 +1009 @@
         url2 = this.src;
         jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
-        type = options.pictureSelType;
+        newtype = options.pictureSelType;
         if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
 
@@ -1021 +1021 @@
         options.pictureMap = typeMap;
         options.pictureDeriv = typeSave;
-
-
         document.cookie = 'picture_deriv=' + typeSave + ';path=' + COOKIE_PATH;
         Autosize_resize(true, options);
+        if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
+
+        } else {
+          jQuery("#bp_img_cla").attr("src", "./plugins/Autosize/icons/button-maximize.png");
+          jQuery("#bp_cla span").text("");
+        }
       })
       .live("ON", function (e) {
@@ -2196 +2200 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         // ready