Browse Source

Expose current jqXHR object on "pre*" events

Maks3w 10 years ago
parent
commit
7aa99a9dbd
2 changed files with 12 additions and 9 deletions
  1. 6 3
      README.md
  2. 6 6
      js/fileinput.js

+ 6 - 3
README.md

@@ -961,9 +961,10 @@ $('#input-id').on('fileunlock', function(event, filestack, extraData) {
 This event is triggered before deletion of each thumbnail file in the `initialPreview` content set. Additional parameters available are: 
 
 - `key`: the key passed within `initialPreviewConfig` for the selected file for delete.
+- `jqXHR`: the `jQuery XMLHttpRequest` object used for this transaction.
 
 ```js
-$('#input-id').on('filepredelete', function(event, key) {
+$('#input-id').on('filepredelete', function(event, key, jqXHR) {
     console.log('Key = ' + key);
 });
 ```
@@ -1010,9 +1011,10 @@ This event is triggered before upload of each thumbnail file. Additional paramet
     - `reader`: the FileReader instance if available
 - `previewId`: the identifier of the preview thumbnail container.
 - `index`: the zero-based index of the file in the preview container.
+- `jqXHR`: the `jQuery XMLHttpRequest` object used for this transaction.
 
 ```js
-$('#input-id').on('filepreupload', function(event, data, previewId, index) {
+$('#input-id').on('filepreupload', function(event, data, previewId, index, jqXHR) {
     var form = data.form, files = data.files, extra = data.extra, 
         response = data.response, reader = data.reader;
     console.log('File pre upload triggered');
@@ -1070,9 +1072,10 @@ Additional parameters available are:
     - `extra`: the `uploadExtraData` settings for the plugin (or empty object if not available).
     - `response`: the data sent via ajax response (or empty object if not available).
     - `reader`: the FileReader instance if available
+- `jqXHR`: the `jQuery XMLHttpRequest` object used for this transaction.
 
 ```js
-$('#input-id').on('filebatchpreupload', function(event, data) {
+$('#input-id').on('filebatchpreupload', function(event, data, jqXHR) {
     var form = data.form, files = data.files, extra = data.extra, 
         response = data.response, reader = data.reader;
     console.log('File batch pre upload triggered');

+ 6 - 6
js/fileinput.js

@@ -646,10 +646,10 @@
                         type: 'POST',
                         dataType: 'json',
                         data: {key: vKey},
-                        beforeSend: function() {
+                        beforeSend: function(jqXHR) {
                             addCss($frame, 'file-uploading');
                             addCss($el, 'disabled');
-                            self.raise('filepredelete', [vKey]);
+                            self.raise('filepredelete', [vKey, jqXHR]);
                         },
                         success: function(data, textStatus, jqXHR) {
                             if(typeof data.error === 'undefined') {
@@ -916,7 +916,7 @@
                 cache: false,
                 processData: false,
                 contentType: false,
-                beforeSend: function() {
+                beforeSend: function(jqXHR) {
                     var outData = self.getOutData();
                     setIndicator('indicatorLoading', 'indicatorLoadingTitle');
                     addCss($thumb, 'file-uploading');
@@ -925,7 +925,7 @@
                     if (!allFiles) {
                         self.lock();
                     }
-                    self.raise('filepreupload', [outData, previewId, i])
+                    self.raise('filepreupload', [outData, previewId, i, jqXHR])
                 },
                 success: function(data, textStatus, jqXHR) {
                     var outData = self.getOutData(data);
@@ -1004,7 +1004,7 @@
                 cache: false,
                 processData: false,
                 contentType: false,
-                beforeSend: function() {
+                beforeSend: function(jqXHR) {
                     self.lock();
                     var outData = self.getOutData();
                     if (!self.showPreview) {
@@ -1016,7 +1016,7 @@
                         $btnUpload.attr('disabled', true);
                         $btnDelete.attr('disabled', true);
                     });
-                    self.raise('filebatchpreupload', [outData]);
+                    self.raise('filebatchpreupload', [outData, jqXHR]);
                 },
                 success: function(data, textStatus, jqXHR) {
                     var outData = self.getOutData(data);