Trigger aborts of unstarted file uploads in the core plugin. Closes blueimp#2751

blueimp · blueimp · commit 08a5d5c79355 · 2013-11-20T17:44:03.000+01:00
diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "title": "jQuery File Upload",
   "author": {
     "name": "Sebastian Tschan",
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "title": "jQuery File Upload",
   "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
   "keywords": [
diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload AngularJS Plugin 2.0.1
+ * jQuery File Upload AngularJS Plugin 2.1.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -69,7 +69,6 @@
                         return data.submit();
                     };
                     file.$cancel = function () {
-                        scope.clear(files);
                         return data.abort();
                     };
                 },
@@ -134,11 +133,13 @@
                     if (e.isDefaultPrevented()) {
                         return false;
                     }
-                    var that = this;
+                    var that = this,
+                        scope = data.scope();
                     if (data.errorThrown === 'abort') {
+                        scope.clear(data.files);
                         return;
                     }
-                    data.scope().$apply(function () {
+                    scope.$apply(function () {
                         data.handleResponse.call(that, e, data);
                     });
                 },
diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload User Interface Plugin 9.0.0
+ * jQuery File Upload User Interface Plugin 9.4.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -517,12 +517,12 @@
             var template = $(e.currentTarget)
                     .closest('.template-upload,.template-download'),
                 data = template.data('data') || {};
-            if (!data.jqXHR) {
-                data.context = data.context || template;
+            data.context = data.context || template;
+            if (data.abort) {
+                data.abort();
+            } else {
                 data.errorThrown = 'abort';
                 this._trigger('fail', e, data);
-            } else {
-                data.jqXHR.abort();
             }
         },
 
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.38.0
+ * jQuery File Upload Plugin 5.39.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -651,7 +651,8 @@
                     return this.jqXHR.abort();
                 }
                 this.errorThrown = 'abort';
-                return that._getXHRPromise();
+                that._trigger('fail', null, this);
+                return that._getXHRPromise(false);
             };
             data.state = function () {
                 if (this.jqXHR) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "title": "jQuery File Upload",
   "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "blueimp-file-upload",`
`3`		`- "version": "9.3.0",`
	`3`	`+ "version": "9.4.0",`
`4`	`4`	`"title": "jQuery File Upload",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Sebastian Tschan",`