Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/danialfarid/angular-file-…
Browse files Browse the repository at this point in the history 
…upload
  • Loading branch information
Danial Farid authored and Danial Farid committed Apr 12, 2015
2 parents 339a0bc + 1fcb52d commit e7247e1
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 23 deletions.
13 changes: 8 additions & 5 deletions demo/war/js/angular-file-upload-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
config.headers = config.headers || {};
config.headers['Content-Type'] = undefined;
config.transformRequest = config.transformRequest ?
(Object.prototype.toString.call(config.transformRequest) === '[object Array]' ?
(angular.isArray(config.transformRequest) ?
config.transformRequest : [config.transformRequest]) : [];
config.transformRequest.push(function (data) {
var formData = new FormData();
Expand All @@ -142,10 +142,13 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
if (allFields.hasOwnProperty(key)) {
var val = allFields[key];
if (val !== undefined) {
if (Object.prototype.toString.call(val) === '[object String]') {
if (angular.isDate(val)) {
val = val.toISOString();
}
if (angular.isString(val)) {
formData.append(key, val);
} else {
if (config.sendObjectsAsJsonBlob && typeof val === 'object') {
if (config.sendObjectsAsJsonBlob && angular.isObject(val)) {
formData.append(key, new Blob([val], {type: 'application/json'}));
} else {
formData.append(key, JSON.stringify(val));
Expand All @@ -160,8 +163,8 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
if (config.file != null) {
var fileFormName = config.fileFormDataName || 'file';

if (Object.prototype.toString.call(config.file) === '[object Array]') {
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
if (angular.isArray(config.file)) {
var isFileFormNameString = angular.isString(fileFormName);
for (i = 0; i < config.file.length; i++) {
formData.append(isFileFormNameString ? fileFormName : fileFormName[i], config.file[i],
(config.fileName && config.fileName[i]) || config.file[i].name);
Expand Down
13 changes: 8 additions & 5 deletions demo/war/js/angular-file-upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
config.headers = config.headers || {};
config.headers['Content-Type'] = undefined;
config.transformRequest = config.transformRequest ?
(Object.prototype.toString.call(config.transformRequest) === '[object Array]' ?
(angular.isArray(config.transformRequest) ?
config.transformRequest : [config.transformRequest]) : [];
config.transformRequest.push(function (data) {
var formData = new FormData();
Expand All @@ -142,10 +142,13 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
if (allFields.hasOwnProperty(key)) {
var val = allFields[key];
if (val !== undefined) {
if (Object.prototype.toString.call(val) === '[object String]') {
if (angular.isDate(val)) {
val = val.toISOString();
}
if (angular.isString(val)) {
formData.append(key, val);
} else {
if (config.sendObjectsAsJsonBlob && typeof val === 'object') {
if (config.sendObjectsAsJsonBlob && angular.isObject(val)) {
formData.append(key, new Blob([val], {type: 'application/json'}));
} else {
formData.append(key, JSON.stringify(val));
Expand All @@ -160,8 +163,8 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
if (config.file != null) {
var fileFormName = config.fileFormDataName || 'file';

if (Object.prototype.toString.call(config.file) === '[object Array]') {
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
if (angular.isArray(config.file)) {
var isFileFormNameString = angular.isString(fileFormName);
for (i = 0; i < config.file.length; i++) {
formData.append(isFileFormNameString ? fileFormName : fileFormName[i], config.file[i],
(config.fileName && config.fileName[i]) || config.file[i].name);
Expand Down
13 changes: 8 additions & 5 deletions dist/angular-file-upload-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
config.headers = config.headers || {};
config.headers['Content-Type'] = undefined;
config.transformRequest = config.transformRequest ?
(Object.prototype.toString.call(config.transformRequest) === '[object Array]' ?
(angular.isArray(config.transformRequest) ?
config.transformRequest : [config.transformRequest]) : [];
config.transformRequest.push(function (data) {
var formData = new FormData();
Expand All @@ -142,10 +142,13 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
if (allFields.hasOwnProperty(key)) {
var val = allFields[key];
if (val !== undefined) {
if (Object.prototype.toString.call(val) === '[object String]') {
if (angular.isDate(val)) {
val = val.toISOString();
}
if (angular.isString(val)) {
formData.append(key, val);
} else {
if (config.sendObjectsAsJsonBlob && typeof val === 'object') {
if (config.sendObjectsAsJsonBlob && angular.isObject(val)) {
formData.append(key, new Blob([val], {type: 'application/json'}));
} else {
formData.append(key, JSON.stringify(val));
Expand All @@ -160,8 +163,8 @@ angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function ($http
if (config.file != null) {
var fileFormName = config.fileFormDataName || 'file';

if (Object.prototype.toString.call(config.file) === '[object Array]') {
var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
if (angular.isArray(config.file)) {
var isFileFormNameString = angular.isString(fileFormName);
for (i = 0; i < config.file.length; i++) {
formData.append(isFileFormNameString ? fileFormName : fileFormName[i], config.file[i],
(config.fileName && config.fileName[i]) || config.file[i].name);
Expand Down
Loading

0 comments on commit e7247e1

Please sign in to comment.