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

Timestamp:

Oct 24, 2012, 5:29:52 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (setup miniature when not admin_enabled)

File:

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

extensions/Autosize/js/autosize_ajax.js

@@ -18 +18 @@
   function progress(success,data) {
     if (success) {
+      
       jQuery("#theMainImage").trigger("ON", [{ nb: derivatives.total - derivatives.done, total: derivatives.total, done: derivatives.done,status:"ok",src:data.url}]);
     } else {
-      jQuery("#theMainImage").trigger("ON", [{ nb: derivatives.total - derivatives.done, total: derivatives.total, done: derivatives.done, status: "Nok"}]);
+
+    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}]);
+    }
     }
 
@@ -35 +41 @@
   function getDerivativeUrls(nofile) {
     params.max_urls = nofile.length;
-    popup = jQuery(".infos");
-    if (popup.length == 0) {
-   //   jQuery("#theImage").append("<div class='infos'></div>");
-    }
-
     jQuery(nofile).each(function (i, t) {
       if (typeof t.file != "undefined") {
         nbsrc = params.src.length;
+        t.file=   t.file.replace("/","",1);
         if (nbsrc == 0) {
           params.ids.push(t.id);
           params.types.push(t.type);
           params.src.push(t.file);
-        }else if (~jQuery.inArray( t.file,params.src )) {
+        } else if (~jQuery.inArray(t.file, params.src)) {
           jQuery.noop();
         } else {
@@ -53 +55 @@
           params.types.push(t.type);
           params.src.push(t.file);
-
         }
       }
     });
+
     if(derivatives.elements.length==0)
-    derivatives.elements = params.ids;
+            derivatives.elements = params.ids;
+    derivatives.total += params.src.length;
+ 
+
+  Set_images = function (dataUrls) {
+    if (typeof jQuery.manageAjax != "undefined") {
+      for (var i = 0; i < dataUrls.length; i++) {
+        jQuery.manageAjax.add("queued", {
+          type: 'GET',
+          url: 'i.php?' + dataUrls[i] + "&ajaxload=true",
+          dataType: 'json',
+          success: (function (data) {
+            derivatives.done++;
+            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.ajax({
-      type: "POST",
-      url: 'ws.php?format=json&method=pwg.getMissingDerivatives',
-      data: params,
-      dataType: "json",
-      success: function (data) {
-        if (!data.stat || data.stat != "ok") {
-          return;
-        }
-        derivatives.total += data.result.urls.length;
-        if (typeof jQuery.manageAjax != "undefined") {
-          for (var i = 0; i < data.result.urls.length; i++) {
-          
-            jQuery.manageAjax.add("queued", {
-              type: 'GET',
-              url: data.result.urls[i] + "&ajaxload=true",
-              dataType: 'json',
-              success: (function (data) {
-                         derivatives.done++;
-                         progress(true, data);
-                      }),
-              error:  (function (data) {
-                          derivatives.done++; 
-                          progress(false, data);
-                      }) 
-              });
-          }
-          if (derivatives.elements.length) {      
-              if(derivatives.total - derivatives.done > 0    ) 
-                  setTimeout("getDerivativeUrls(nofile)", 100 * (derivatives.total - derivatives.done));
-          }
-        }
-      },
-      error: function (data) {
-        progress(false);
-      }
-    });
-        }
+  if (derivatives.elements.length) {
+    if (derivatives.total - derivatives.done > 0)
+      setTimeout("Set_images(params.src)", 500 * (derivatives.total - derivatives.done));
+  }
+
+   
+
+        } //ready 
   //===============================================================