multiple files for HTML5 browsers danialfarid#69

danialfarid · danialfarid · commit 384bc5974829 · 2013-12-13T17:14:55.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angularjs-file-upload",
   "main": "angular-file-upload.min.js",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "homepage": "https://github.com/danialfarid/angular-file-upload",
   "authors": [
     "Danial Farid <danial.farid@gmail.com>"
diff --git a/demo/war/js/angular-file-upload-html5-shim.js b/demo/war/js/angular-file-upload-html5-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for angular XHR HTML5 browsers
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.1.10
+ * @version 1.1.11
  */
 if (window.XMLHttpRequest) {
         if (window.FormData) {
diff --git a/demo/war/js/angular-file-upload-shim.js b/demo/war/js/angular-file-upload-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for HTML5 FormData
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.1.10
+ * @version 1.1.11
  */
 (function() {
 
diff --git a/demo/war/js/angular-file-upload.js b/demo/war/js/angular-file-upload.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload/drop directive with http post and progress
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.1.10
+ * @version 1.1.11
  */
 (function() {
 	
@@ -35,7 +35,16 @@ angularFileUpload.service('$upload', ['$http', '$rootScope', '$timeout', functio
 			}
 		}
 		config.transformRequest =  angular.identity;
-		formData.append(config.fileFormDataName || 'file', config.file, config.file.name);
+		
+		var fileFromName = config.fileFormDataName || 'file';
+		
+		if (Object.prototype.toString.call(config.file) === '[object Array]') {
+			for (var i = 0; i < config.file.length; i++) {
+				formData.append(fileFromName + i, config.file[i], config.file[i].name);
+			}
+		} else {
+			formData.append(fileFromName, config.file, config.file.name);
+		}
 
 		formData['__setXHR_'] = function(xhr) {
 			config.__XHR = xhr;
diff --git a/dist/angular-file-upload-html5-shim.js b/dist/angular-file-upload-html5-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for angular XHR HTML5 browsers
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.1.10
+ * @version 1.1.11
  */
 if (window.XMLHttpRequest) {
         if (window.FormData) {
diff --git a/dist/angular-file-upload-html5-shim.min.js b/dist/angular-file-upload-html5-shim.min.js
diff --git a/dist/angular-file-upload-shim.js b/dist/angular-file-upload-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for HTML5 FormData
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.1.10
+ * @version 1.1.11
  */
 (function() {
 
diff --git a/dist/angular-file-upload-shim.min.js b/dist/angular-file-upload-shim.min.js
diff --git a/dist/angular-file-upload.js b/dist/angular-file-upload.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload/drop directive with http post and progress
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.1.10
+ * @version 1.1.11
  */
 (function() {
 	
@@ -35,7 +35,16 @@ angularFileUpload.service('$upload', ['$http', '$rootScope', '$timeout', functio
 			}
 		}
 		config.transformRequest =  angular.identity;
-		formData.append(config.fileFormDataName || 'file', config.file, config.file.name);
+		
+		var fileFromName = config.fileFormDataName || 'file';
+		
+		if (Object.prototype.toString.call(config.file) === '[object Array]') {
+			for (var i = 0; i < config.file.length; i++) {
+				formData.append(fileFromName + i, config.file[i], config.file[i].name);
+			}
+		} else {
+			formData.append(fileFromName, config.file, config.file.name);
+		}
 
 		formData['__setXHR_'] = function(xhr) {
 			config.__XHR = xhr;
diff --git a/dist/angular-file-upload.min.js b/dist/angular-file-upload.min.js
diff --git a/nuget/Package.nuspec b/nuget/Package.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>angular-file-upload</id>
     <title>Angular file upload</title>
-    <version>1.1.10.1</version>
+    <version>1.1.11</version>
     <authors>Danial Farid, Georgios Diamantopoulos (nuget package)</authors>
     <owners>Danial Farid</owners>
     <licenseUrl>https://github.com/danialfarid/angular-file-upload/blob/master/LICENSE</licenseUrl>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-file-upload",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-uglify": "~0.2.7",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angularjs-file-upload",`
`3`	`3`	`"main": "angular-file-upload.min.js",`
`4`		`- "version": "1.1.10",`
	`4`	`+ "version": "1.1.11",`
`5`	`5`	`"homepage": "https://github.com/danialfarid/angular-file-upload",`
`6`	`6`	`"authors": [`
`7`	`7`	`"Danial Farid <danial.farid@gmail.com>"`