Skip to content

Commit 84e58fc

Browse files
danialfariddanialfarid
committed
fixed danialfarid#100 custom file formData names
1 parent 7563189 commit 84e58fc

9 files changed

+21
-24
lines changed

‎demo/war/js/angular-file-upload.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,15 @@ angularFileUpload.service('$upload', ['$http', '$rootScope', '$timeout', functio
9292
}
9393
config.transformRequest = angular.identity;
9494

95-
var fileFromName = config.fileFormDataName || 'file';
95+
var fileFormName = config.fileFormDataName || 'file';
9696

9797
if (Object.prototype.toString.call(config.file) === '[object Array]') {
98-
for (var i = 0; i < config.file.length; i++) {
99-
formData.append(fileFromName + i, config.file[i], config.file[i].name);
98+
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
99+
for (var i = 0; i < config.file.length; i++) {
100+
formData.append(isFileFormNameString ? fileFormName + i : fileFormName[i], config.file[i], config.file[i].name);
100101
}
101102
} else {
102-
formData.append(fileFromName, config.file, config.file.name);
103+
formData.append(fileFormName, config.file, config.file.name);
103104
}
104105

105106
config.data = formData;

‎dist/angular-file-upload-html5-shim.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**!
22
* AngularJS file upload shim for angular XHR HTML5 browsers
33
* @author Danial <danial.farid@gmail.com>
4-
* @version 1.2.3
4+
* @version 1.2.4
55
*/
66
if (window.XMLHttpRequest) {
77
if (window.FormData) {

‎dist/angular-file-upload-html5-shim.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-file-upload-shim.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**!
22
* AngularJS file upload shim for HTML5 FormData
33
* @author Danial <danial.farid@gmail.com>
4-
* @version 1.2.3
4+
* @version 1.2.4
55
*/
66
(function() {
77

‎dist/angular-file-upload-shim.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-file-upload.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**!
22
* AngularJS file upload/drop directive with http post and progress
33
* @author Danial <danial.farid@gmail.com>
4-
* @version 1.2.3
4+
* @version 1.2.4
55
*/
66
(function() {
77

@@ -12,7 +12,7 @@ angularFileUpload.service('$upload', ['$http', '$rootScope', '$timeout', functio
1212
config.method = config.method || 'POST';
1313
config.headers = config.headers || {};
1414
config.transformRequest = config.transformRequest || function(data) {
15-
if (data instanceof ArrayBuffer) {
15+
if (window.ArrayBuffer && data instanceof ArrayBuffer) {
1616
return data;
1717
}
1818
return $http.defaults.transformRequest[0](data);
@@ -92,19 +92,15 @@ angularFileUpload.service('$upload', ['$http', '$rootScope', '$timeout', functio
9292
}
9393
config.transformRequest = angular.identity;
9494

95-
var filename, fileFromName = config.fileFormDataName || 'file';
95+
var fileFormName = config.fileFormDataName || 'file';
9696

97-
if (Object.prototype.toString.call(config.file) === '[object Array]') {
98-
for (var i = 0; i < config.file.length; i++) {
99-
filename = (Object.prototype.toString.call(fileFromName) === '[object Array]')
100-
? (fileFromName.length == 1) ? fileFromName[0] + i
101-
: (!!fileFromName[i]) ? fileFromName[i]
102-
: fileFromName[fileFromName.length - 1] + i
103-
: fileFromName + i
104-
formData.append(filename, config.file[i], config.file[i].name);
97+
if (Object.prototype.toString.call(config.file) === '[object Array]') {
98+
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
99+
for (var i = 0; i < config.file.length; i++) {
100+
formData.append(isFileFormNameString ? fileFormName + i : fileFormName[i], config.file[i], config.file[i].name);
105101
}
106102
} else {
107-
formData.append(fileFromName, config.file, config.file.name);
103+
formData.append(fileFormName, config.file, config.file.name);
108104
}
109105

110106
config.data = formData;

‎dist/angular-file-upload.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nuget/Package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>angular-file-upload</id>
55
<title>Angular file upload</title>
6-
<version>1.2.3</version>
6+
<version>1.2.4</version>
77
<authors>Danial Farid, Georgios Diamantopoulos (nuget package)</authors>
88
<owners>Danial Farid</owners>
99
<licenseUrl>https://github.com/danialfarid/angular-file-upload/blob/master/LICENSE</licenseUrl>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-file-upload",
3-
"version": "1.2.3",
3+
"version": "1.2.4",
44
"devDependencies": {
55
"grunt": "~0.4.1",
66
"grunt-contrib-uglify": "~0.2.7",

0 commit comments

Comments
 (0)