Invoke the _renderPreview callback parameter directly if loadImage() …

…returns false - Fixes blueimp#1007, Fixes blueimp#1008.
gawecoti · Feb 13, 2012 · 8742ffd · 8742ffd
1 parent 2730337
commit 8742ffd
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js
@@ -372,24 +372,26 @@
         _renderPreview: function (file, node, callback) {
             var that = this,
                 options = this.options;
-            loadImage(
-                file,
-                function (img) {
-                    node.append(img);
-                    // Force reflow:
-                    that._reflow = $.support.transition &&
-                        node[0].offsetWidth;
-                    that._transitionCallback(
-                        node.addClass('in'),
-                        callback || $.noop
-                    );
-                },
-                {
-                    maxWidth: options.previewMaxWidth,
-                    maxHeight: options.previewMaxHeight,
-                    canvas: options.previewAsCanvas
-                }
-            );
+            if (!loadImage(
+                    file,
+                    function (img) {
+                        node.append(img);
+                        // Force reflow:
+                        that._reflow = $.support.transition &&
+                            node[0].offsetWidth;
+                        that._transitionCallback(
+                            node.addClass('in'),
+                            callback || $.noop
+                        );
+                    },
+                    {
+                        maxWidth: options.previewMaxWidth,
+                        maxHeight: options.previewMaxHeight,
+                        canvas: options.previewAsCanvas
+                    }
+                ) && callback) {
+                callback();
+            }
         },
 
         _renderUpload: function (files) {
@@ -410,7 +412,9 @@
                             that._renderPreview(
                                 file,
                                 previewNode,
-                                deferred.resolve
+                                function () {
+                                    deferred.resolveWith(that);
+                                }
                             );
                             return deferred.promise();
                         });