Use "this" instead of a closure variable as data parameter inside of …

…the data.submit() method - Fixes #847. Store the jqXHR object returned by data.submit() as property of the data object.
blueimp · Dec 6, 2011 · c99611a · c99611a
1 parent 92dcc73
commit c99611a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/jquery.fileupload-ui.js b/jquery.fileupload-ui.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload User Interface Plugin 5.1
+ * jQuery File Upload User Interface Plugin 5.1.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -71,7 +71,7 @@
                     }).data('data', data);
                 if ((that.options.autoUpload || data.autoUpload) &&
                         data.isValidated) {
-                    data.jqXHR = data.submit();
+                    data.submit();
                 }
             },
             // Callback for the start of each file upload request:
@@ -466,11 +466,8 @@
             e.preventDefault();
             var tmpl = $(this).closest('.template-upload'),
                 data = tmpl.data('data');
-            if (data && data.submit && !data.jqXHR) {
-                data.jqXHR = data.submit();
-                if (data.jqXHR) {
-                    $(this).fadeOut();
-                }
+            if (data && data.submit && !data.jqXHR && data.submit()) {
+                $(this).fadeOut();
             }
         },
 

diff --git a/jquery.fileupload.js b/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.5.1
+ * jQuery File Upload Plugin 5.5.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -397,15 +397,19 @@
             }
             if (ub >= fs) {
                 file.error = 'uploadedBytes';
-                return this._getXHRPromise(false);
+                return this._getXHRPromise(
+                    false,
+                    options.context,
+                    [null, 'error', file.error]
+                );
             }
             // n is the number of blobs to upload,
             // calculated via filesize, uploaded bytes and max chunk size:
             n = Math.ceil((fs - ub) / mcs);
             // The chunk upload method accepting the chunk number as parameter:
             upload = function (i) {
                 if (!i) {
-                    return that._getXHRPromise(true);
+                    return that._getXHRPromise(true, options.context);
                 }
                 // Upload the blobs in sequential order:
                 return upload(i -= 1).pipe(function () {
@@ -596,14 +600,16 @@
                 for (i = 0; i < data.files.length; i += limit) {
                     fileSet.push(data.files.slice(i, i + limit));
                 }
-            }    
+            }
             data.originalFiles = data.files;
             $.each(fileSet || data.files, function (index, element) {
                 var files = fileSet ? element : [element],
                     newData = $.extend({}, data, {files: files});
                 newData.submit = function () {
-                    return (that._trigger('submit', e, newData) !== false) &&
-                        that._onSend(e, newData);
+                    newData.jqXHR = this.jqXHR =
+                        (that._trigger('submit', e, this) !== false) &&
+                        that._onSend(e, this);
+                    return this.jqXHR;
                 };
                 return (result = that._trigger('add', e, newData));
             });