Changeset 18975 for extensions/Autosize/js/autosize_ajax.js

Timestamp:

Nov 8, 2012, 1:59:34 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (FireFox LLGBO select)

File:

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

extensions/Autosize/js/autosize_ajax.js

@@ -17 +17 @@
    
   function progress(success,data) {
-    if (success) {
-      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 {
-
-    if (data.statusText == "OK") {
- 
-    } else {
-      jQuery("#theMainImage").trigger("ON", [{ nb: derivatives.total - derivatives.done, total: derivatives.total, done: derivatives.done, status: "Nok", responseText: data.responseText}]);
-    }
-    }
-
     if (derivatives.finished()) {
       jQuery("#theMainImage").trigger("Finish", [derivatives]);
@@ -44 +29 @@
   function getDerivativeUrls(nofile) {
     params.max_urls = nofile.length;
-    Width = jQuery("#theMainImage").width();
-    Height = jQuery("#theMainImage").height();
-
     jQuery(nofile).each(function (i, t) {
       if (typeof t.file != "undefined") {
         nbsrc = params.src.length;
-        t.file=   t.file.replace("/","",1);
+        var reg = new RegExp("^\/", "g",1);
+        t.file=   t.file.replace( reg ,"",1);
         if (nbsrc == 0) {
           params.ids.push(t.id);
@@ -73 +56 @@
 
 
-    Set_images = function (dataUrls) {
-      if (typeof jQuery.manageAjax != "undefined") {
-        for (var i = 0; i < dataUrls.length; i++) {
-          fichier = dataUrls[i];
-          if (fichier != "")
-            jQuery.manageAjax.add("queued", {
-              type: 'GET',
-              url: 'i.php?' + fichier + "&ajaxload=true",
-              dataType: 'json',
-              success: (function (data) {
-                j = derivatives.done;
-                derivatives.done++;
-                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) {
 
-                }
-                progress(true, data);
-              }),
-              error: (function (data) {
-                // derivatives.done++;
-                progress(data.statusText == "NOK", data);
-              }),
-              fail: (function (data) {
-                a = data.statusText;
-              }),
-              progress: (function (data) {
-                a = data.statusText;
-              }),
-
-              complete: (function (data) {
-                progress(false, data);
-              }),
-              isRejected: (function (data) {
-                a = data.responseText;
-              })
-
-            });
-        }
-
-      }
-    }
 
     jQuery("body").append("<div style='position:abosolute;left:-200;top:-200'>");
@@ -126 +62 @@
     if (derivatives.total - derivatives.done > 0)
       setTimeout("Set_images(params.src)", 500 * (derivatives.total - derivatives.done));
-  }
+     }
+        } //ready 
+        //===============================================================
+        Set_images = function (dataUrls) {
+          if (typeof jQuery.manageAjax != "undefined") {
+            for (var i = 0; i < dataUrls.length; i++) {
+              fichier = dataUrls[i];
+              if (fichier != "")
+                jQuery.manageAjax.add("queued", {
+                  type: 'GET',
+                  url: 'i.php?' + fichier + "&ajaxload=true",
+                  dataType: 'json',
+                  success: (function (data) {
+                    derivatives.done++;
+                    try {
+                      for (var j = 0; j < params.src.length; j++) {
+                        if (data.url.match(params.src[j])) {
+                          params.src[j] = ""; break;
+                        }
+                      }
+                    } catch (e) {
 
-   
+                    }
+                    jQuery("#theMainImage").trigger("Success", data);
+                  }),
+                  error: (function (data) {
+                    jQuery("#theMainImage").trigger("Error", data);
+                  }),
+                  fail: (function (data) {
+                    jQuery("#theMainImage").trigger("fail", data);
+                  }),
+                  progress: (function (data) {
+                    jQuery("#theMainImage").trigger("Progress", data);
+                  }),
 
-        } //ready 
-  //===============================================================
+                  complete: (function (data) {
+                    data.src = jQuery("#theMainImage").attr("src"); 
+                    jQuery("#theMainImage").trigger("Complete", data);
+                  }),
+                  isRejected: (function (data) {
+                    jQuery("#theMainImage").trigger("IsRejected", data);
+                  })
+
+                });
+            }
+
+          }
+        }