Allow to pass only a fileInput to add and send API calls, without hav…

…ing to define the files list manually.
kulor · Jul 6, 2012 · deec6b9 · deec6b9
1 parent 2bc9a5f
commit deec6b9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.11.3
+ * jQuery File Upload Plugin 5.12
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -776,19 +776,30 @@
             }
         },
 
+        _getFileInputFiles: function (fileInput) {
+            fileInput = $(fileInput);
+            var files = $.each($.makeArray(fileInput.prop('files')), this._normalizeFile),
+                value;
+            if (!files.length) {
+                value = fileInput.prop('value');
+                if (!value) {
+                    return [];
+                }
+                // If the files property is not available, the browser does not
+                // support the File API and we add a pseudo File object with
+                // the input value as name with path information removed:
+                files = [{name: value.replace(/^.*\\/, '')}];
+            }
+            return files;
+        },
+
         _onChange: function (e) {
             var that = e.data.fileupload,
                 data = {
-                    files: $.each($.makeArray(e.target.files), that._normalizeFile),
                     fileInput: $(e.target),
                     form: $(e.target.form)
                 };
-            if (!data.files.length) {
-                // If the files property is not available, the browser does not
-                // support the File API and we add a pseudo File object with
-                // the input value as name with path information removed:
-                data.files = [{name: e.target.value.replace(/^.*\\/, '')}];
-            }
+            data.files = that._getFileInputFiles(data.fileInput);
             if (that.options.replaceFileInput) {
                 that._replaceFileInput(data.fileInput);
             }
@@ -925,7 +936,11 @@
             if (!data || this.options.disabled) {
                 return;
             }
-            data.files = $.each($.makeArray(data.files), this._normalizeFile);
+            if (data.fileInput && !data.files) {
+                data.files = this._getFileInputFiles(data.fileInput);
+            } else {
+                data.files = $.each($.makeArray(data.files), this._normalizeFile);
+            }
             this._onAdd(null, data);
         },
 
@@ -936,7 +951,11 @@
         // The method returns a Promise object for the file upload call.
         send: function (data) {
             if (data && !this.options.disabled) {
-                data.files = $.each($.makeArray(data.files), this._normalizeFile);
+                if (data.fileInput && !data.files) {
+                    data.files = this._getFileInputFiles(data.fileInput);
+                } else {
+                    data.files = $.each($.makeArray(data.files), this._normalizeFile);
+                }
                 if (data.files.length) {
                     return this._onSend(null, data);
                 }

diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin Test 6.9
+ * jQuery File Upload Plugin Test 6.9.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -480,8 +480,8 @@ $(function () {
                 ok(true, 'Triggers change callback');
                 strictEqual(
                     data.files.length,
-                    1,
-                    'Creates pseudo File object'
+                    0,
+                    'Returns empty files list'
                 );
             },
             add: $.noop