Skip to content

Commit 788b550

Browse files
danialfariddanialfarid
committed
1 parent 43f139a commit 788b550

9 files changed

+55
-57
lines changed

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,16 @@ angularFileUpload.service('$upload', ['$http', '$timeout', function($http, $time
7979
config.headers['Content-Type'] = undefined;
8080
config.transformRequest = config.transformRequest || $http.defaults.transformRequest;
8181
var formData = new FormData();
82-
if (config.data) {
83-
if (config.formDataAppender) {
84-
for (var key in config.data) {
85-
var val = config.data[key];
86-
config.formDataAppender(formData, key, val);
87-
}
88-
config.transformRequest = angular.identity;
89-
} else {
90-
var origTransformRequest = config.transformRequest;
91-
var origData = config.data;
92-
config.transformRequest = function(formData, headerGetter) {
82+
var origTransformRequest = config.transformRequest;
83+
var origData = config.data;
84+
config.transformRequest = function(formData, headerGetter) {
85+
if (origData) {
86+
if (config.formDataAppender) {
87+
for (var key in origData) {
88+
var val = origData[key];
89+
config.formDataAppender(formData, key, val);
90+
}
91+
} else {
9392
for (var key in origData) {
9493
var val = origData[key];
9594
if (typeof origTransformRequest == 'function') {
@@ -104,23 +103,23 @@ angularFileUpload.service('$upload', ['$http', '$timeout', function($http, $time
104103
}
105104
formData.append(key, val);
106105
}
107-
return formData;
108-
};
109-
}
110-
}
106+
}
111107

112-
if (config.file != null) {
113-
var fileFormName = config.fileFormDataName || 'file';
108+
if (config.file != null) {
109+
var fileFormName = config.fileFormDataName || 'file';
114110

115-
if (Object.prototype.toString.call(config.file) === '[object Array]') {
116-
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
117-
for (var i = 0; i < config.file.length; i++) {
118-
formData.append(isFileFormNameString ? fileFormName + i : fileFormName[i], config.file[i], config.file[i].name);
111+
if (Object.prototype.toString.call(config.file) === '[object Array]') {
112+
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
113+
for (var i = 0; i < config.file.length; i++) {
114+
formData.append(isFileFormNameString ? fileFormName + i : fileFormName[i], config.file[i], config.file[i].name);
115+
}
116+
} else {
117+
formData.append(fileFormName, config.file, config.file.name);
118+
}
119119
}
120-
} else {
121-
formData.append(fileFormName, config.file, config.file.name);
122120
}
123-
}
121+
return formData;
122+
};
124123

125124
config.data = formData;
126125

‎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.10
4+
* @version 1.2.11
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.10
4+
* @version 1.2.11
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: 24 additions & 25 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.10
4+
* @version 1.2.11
55
*/
66
(function() {
77

@@ -79,17 +79,16 @@ angularFileUpload.service('$upload', ['$http', '$timeout', function($http, $time
7979
config.headers['Content-Type'] = undefined;
8080
config.transformRequest = config.transformRequest || $http.defaults.transformRequest;
8181
var formData = new FormData();
82-
if (config.data) {
83-
if (config.formDataAppender) {
84-
for (var key in config.data) {
85-
var val = config.data[key];
86-
config.formDataAppender(formData, key, val);
87-
}
88-
config.transformRequest = angular.identity;
89-
} else {
90-
var origTransformRequest = config.transformRequest;
91-
var origData = config.data;
92-
config.transformRequest = function(formData, headerGetter) {
82+
var origTransformRequest = config.transformRequest;
83+
var origData = config.data;
84+
config.transformRequest = function(formData, headerGetter) {
85+
if (origData) {
86+
if (config.formDataAppender) {
87+
for (var key in origData) {
88+
var val = origData[key];
89+
config.formDataAppender(formData, key, val);
90+
}
91+
} else {
9392
for (var key in origData) {
9493
var val = origData[key];
9594
if (typeof origTransformRequest == 'function') {
@@ -104,23 +103,23 @@ angularFileUpload.service('$upload', ['$http', '$timeout', function($http, $time
104103
}
105104
formData.append(key, val);
106105
}
107-
return formData;
108-
};
109-
}
110-
}
106+
}
111107

112-
if (config.file != null) {
113-
var fileFormName = config.fileFormDataName || 'file';
108+
if (config.file != null) {
109+
var fileFormName = config.fileFormDataName || 'file';
114110

115-
if (Object.prototype.toString.call(config.file) === '[object Array]') {
116-
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
117-
for (var i = 0; i < config.file.length; i++) {
118-
formData.append(isFileFormNameString ? fileFormName + i : fileFormName[i], config.file[i], config.file[i].name);
111+
if (Object.prototype.toString.call(config.file) === '[object Array]') {
112+
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
113+
for (var i = 0; i < config.file.length; i++) {
114+
formData.append(isFileFormNameString ? fileFormName + i : fileFormName[i], config.file[i], config.file[i].name);
115+
}
116+
} else {
117+
formData.append(fileFormName, config.file, config.file.name);
118+
}
119119
}
120-
} else {
121-
formData.append(fileFormName, config.file, config.file.name);
122120
}
123-
}
121+
return formData;
122+
};
124123

125124
config.data = formData;
126125

‎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.10</version>
6+
<version>1.2.11</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.10",
3+
"version": "1.2.11",
44
"devDependencies": {
55
"grunt": "~0.4.1",
66
"grunt-contrib-uglify": "~0.2.7",

0 commit comments

Comments
 (0)