Reject the processing if the errorThrown property has been set.

This allows aborting the processing queue via data.abort() call.

Author: blueimp

js/jquery.fileupload-process.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Processing Plugin 1.2.2
+ * jQuery File Upload Processing Plugin 1.3.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2012, Sebastian Tschan
@@ -64,13 +64,17 @@
             */
         },
 
-        _processFile: function (data) {
+        _processFile: function (data, originalData) {
             var that = this,
                 dfd = $.Deferred().resolveWith(that, [data]),
                 chain = dfd.promise();
             this._trigger('process', null, data);
             $.each(data.processQueue, function (i, settings) {
                 var func = function (data) {
+                    if (originalData.errorThrown) {
+                        return $.Deferred()
+                                .rejectWith(that, [originalData]).promise();
+                    }
                     return that.processActions[settings.action].call(
                         that,
                         data,
@@ -136,7 +140,11 @@
                 $.each(data.files, function (index) {
                     var opts = index ? $.extend({}, options) : options,
                         func = function () {
-                            return that._processFile(opts);
+                            if (data.errorThrown) {
+                                return $.Deferred()
+                                        .rejectWith(that, [data]).promise();
+                            }
+                            return that._processFile(opts, data);
                         };
                     opts.index = index;
                     that._processing += 1;

js/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.34.0
+ * jQuery File Upload Plugin 5.35.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -607,16 +607,23 @@
         // Adds convenience methods to the data callback argument:
         _addConvenienceMethods: function (e, data) {
             var that = this,
-                getPromise = function (data) {
-                    return $.Deferred().resolveWith(that, [data]).promise();
+                getPromise = function (args) {
+                    return $.Deferred().resolveWith(that, args).promise();
                 };
             data.process = function (resolveFunc, rejectFunc) {
                 if (resolveFunc || rejectFunc) {
                     data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise(this))
-                            .pipe(resolveFunc, rejectFunc);
+                        (this._processQueue || getPromise([this])).pipe(
+                            function () {
+                                if (data.errorThrown) {
+                                    return $.Deferred()
+                                        .rejectWith(that, [data]).promise();
+                                }
+                                return getPromise(arguments);
+                            }
+                        ).pipe(resolveFunc, rejectFunc);
                 }
-                return this._processQueue || getPromise(this);
+                return this._processQueue || getPromise([this]);
             };
             data.submit = function () {
                 if (this.state() !== 'pending') {
@@ -633,6 +640,7 @@
                 if (this.jqXHR) {
                     return this.jqXHR.abort();
                 }
+                this.errorThrown = 'abort';
                 return that._getXHRPromise();
             };
             data.state = function () {