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

Timestamp:

Oct 25, 2012, 3:24:09 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (option marge bottom)

File:

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

extensions/Autosize/js/Affiche_script.js

@@ -57 +57 @@
     }
     //____________________ Save_cookies _____________________________
+    /************************************************
+    *
+    *************************************************/
     Get_cookies = function () {
       parametres = {
@@ -76 +79 @@
         theImageBottom: jQuery.cookie('theImageBottom'),
         theImageRight: jQuery.cookie('theImageRight'),
-
         theImageMargeZone: { width: jQuery.cookie('theImageMargeWidth'),
           height: jQuery.cookie('theImageMargeHeight')
@@ -334 +336 @@
       }
 
+      infos_theImage = jQuery(theImage_id).infos(true);                 // conteneur
+
 
       if (test_theme("simple")) {
@@ -339 +343 @@
         theImageAndInfos_id = "#content";
         infos_theImageAndInfos = jQuery(theImageAndInfos_id).infos();  // Cadre general
-        infos_theImage = jQuery(theImage_id).infos(true);                 // conteneur
         infos_theImage.height = infos_window.height - infos_theImage.top;
         //  jQuery(theImage_id).height(infos_theImage.height);
@@ -365 +368 @@
         zheight = infos_window.height - (infos_theImage.top);
       }
-      h01 = 0;
-      h02 = 0;
-      if (options.check_desc_v) {
-
-        infos_comments = jQuery("#comments").infos(true);
-        infos_Licence = jQuery(".licencetag").infos(true);
-        infos_imageComment = jQuery(imageComment_id).infos(true);
-
-        if (infos_imageComment.visible == true && infos_imageComment.general.bottom > infos_theMainImage.bottom) {
-          h02 = infos_imageComment.general.bottom - infos_theMainImage.bottom;
-        }
-        if (infos_Licence.visible == true && infos_Licence.general.bottom > infos_theMainImage.bottom) {
-          h01 = infos_Licence.general.bottom - infos_theMainImage.bottom;
-        }
-        delta_h = infos_imageInfos.bottom - infos_imageInfos.top;
-        info_comments1 = jQuery(theImage_id + " p").infos(true);
-        if (test_theme("simple")) {
-          options.marge_basse += info_comments1.general.height;
-
-        } else {
-          if (test_theme("stripped")) {
-
-          } else
-            options.marge_basse += Math.max(h01, h02);
+
+
+      if (options.check_desc_v) { }
+
+      infos_comments = jQuery("#comments").infos(true);
+      infos_Licence = jQuery(".licencetag").infos(true);
+      infos_imageComment = jQuery(imageComment_id).infos(true);
+
+
+
+      if (test_theme("simple")) {
+
+
+      } else {
+        if (test_theme("stripped")) {
+
+        } else
 
           if (test_theme("blanc , pure, hr_ ")) {
@@ -394 +390 @@
             options.marge_droite += 10;
           }
-        }
-      }
+      }
+
+
       Zone_image = { image_init: {
         width: infos_theMainImage.width,
@@ -597 +594 @@
     **********************/
     jQuery("#theMainImage," + theMainImage_id + ",.preload, .next1 , ")
-        .load(function (e) {         
+        .load(function (e) {
           src = this.src;
           theMainImage_st = true;
@@ -603 +600 @@
             Zone_image = {};
           }
-          Zone_image.image_init = { width: this.width, height: this.height, rapport: this.width / this.height }
-          return;
-          if (typeof theMainImage_id != "undefined")
-            if (!init_img(this)) {
-              nu_img = 0;
+          Zone_image.image_init = { width: this.width, height: this.height, rapport: this.width / this.height };
+          if (!init_img(this)) {
+            nu_img = 0;
+          }
+
+        })
+         .error(function (e) {
+           if (!this.complete) {
+             jQuery(this).hide();
+
+           }
+
+         })
+         .bind("Finish", function (e, data) {
+           if (typeof imageInfos_id == "undefined") return;
+           Autosize_resize(true, options);
+         })
+          .bind("ON", function (e, data) {
+            if (data.status != "ok") {
+              popup = jQuery(".errors");
+              if (popup.length == 0) {
+                jQuery("#theImage").append("<div class='errors'><span></span></div>");
+              }
+              jQuery(".errors").text("Erreur : [" + data.done + "] " + data.responseText);
+              jQuery(".errors").show().delay(20000).hide(2000);
+              return;
             }
-          })
-         .error(function (e) {
-
-         })
-         .bind("Finish", function (e, data) {             
-              if (typeof imageInfos_id == "undefined") return;
-                  Autosize_resize(true, options);
-          })
-          .bind("ON", function (e, data) {
-         if (data.status != "ok") {
-           popup = jQuery(".errors");
-           if (popup.length == 0) {
-             jQuery("#theImage").append("<div class='errors'><span></span></div>");
-           }
-           jQuery(".errors").text("Erreur : [" + data.done + "] " + data.responseText);
-           jQuery(".errors").show().delay(20000).hide(2000);
-           return;
-         }
-         if (data.src) {
-           theImg = document.getElementById(theMainImage_id.replace("#", ""));
-            jQuery("#theMainImage").attr("src", data.src);
-            theImg.src = data.src;
-           if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
-             theImg.src = options.imgSrc;
-
-           }
-         }
-       });
+            if (data.src) {
+              theImg = document.getElementById(theMainImage_id.replace("#", ""));
+              jQuery("#theMainImage").attr("src", data.src);
+              theImg.src = data.src;
+              if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
+                theImg.src = options.imgSrc;
+
+              }
+            }
+          });
 
 
@@ -900 +900 @@
       Save_cookies(options);
       if (options.pictureSelType != "Autosize" && options.pictureSelType != "SelMaxi") {
+        jQuery(theImg).width(Zone_image.image_init.width);
+        jQuery(theImg).height(Zone_image.image_init.height);
         return;
 
@@ -968 +970 @@
       if (url) {
         if (options.imgSrc != url) {
-          url = options.imgSrc;
+          options.imgSrc = url;
         }
       }
@@ -998 +1000 @@
         this.src = this.src;
         // alert(this.src + ' Image does not exist !!');
+      }).error(function (i) {
+        this.src = this.src;
       });
       ;
@@ -1207 +1211 @@
       if (typeof Zone_image == "undefined") Zone_image = { image: {} };
       if (typeof Zone_image.image == "undefined") Zone_image.image = { height: Zone_image.image_init.height, width: Zone_image.image_init.width };
-      theImg.height = img_init.height;
-      theImg.width = img_init.width;
+      // theImg.height = img_init.height;
+      //  theImg.width = img_init.width;
 
       Zone_image.image_init = { height: img_init.height, width: img_init.width, rapport: img_init.rapport };
@@ -1312 +1316 @@
         options.theImageMargeZone = Zone_image.marges;
         if (Type_Img != 'charlie') {
-          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize" && Type_Img != 'pamoorama') {
-            IMg = Get_Maxi(Zone_image.image_init);
+          if (options.pictureSelType != "SelMaxi" && options.pictureSelType != "Autosize" ) {
+          return ;
           } else {
             IMg = Get_Maxi(Zone_image.image);
@@ -1576 +1580 @@
       retrait_img.height += 2;
 
+
       //===============================================================
       retrait_img.width = Math.ceil(infos_theMainImage.general.marges.width); // borderwidth+padding
@@ -1581 +1586 @@
       retrait_img.width += Math.ceil(options.marges_llgbo || 0);
       retrait_img.width += 2;
-
+      if (!options.check_desc_v)
+        marge_bottom = 0;
 
       //================== Limite Format Image =====================
@@ -1729 +1735 @@
         case "img_autre":
           if (!theMainImage_id) {
-            if (DEBUG_autosize == "true") alert("The_MainImage=null");
+            if (DEBUG_autosize.match("true", gi)) alert("The_MainImage=null");
             return;
 
@@ -1956 +1962 @@
     *********************************************/
     /*
-    if (DEBUG_autosize == "true") {
+    if (DEBUG_autosize.match("true",gi))   {
     for (var i = 0; i < 10; i++) {
     jQuery('#adddebugs').click();
@@ -1999 +2005 @@
 
 
-    if (DEBUG_autosize == "mouse") {
+    if (DEBUG_autosize.match("mouse", "gi")) {
       var mouseLocation = new Point(-500, -500);
       function Point(x, y) {
@@ -2129 +2135 @@
     function Debug_pos() {
       return;
-      if (DEBUG_autosize == "true") {
+      if (DEBUG_autosize.match("true", gi)) {
 
         jQuery("[id ^='Debug']").show();
@@ -2155 +2161 @@
 
 
-  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // ready
+  });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // ready