Merge branch 'master' of https://github.com/danialfarid/angular-file-upload

danialfarid · danialfarid · commit 6e1876b8ea1b · 2013-12-30T15:03:02.000-05:00
diff --git a/README.md b/README.md
@@ -46,13 +46,14 @@ var MyCtrl = [ '$scope', '$upload', function($scope, $upload) {
   $scope.onFileSelect = function($files) {
     //$files: an array of files selected, each file has name, size, and type.
     for (var i = 0; i < $files.length; i++) {
-      var $file = $files[i];
+      var file = $files[i];
       $scope.upload = $upload.upload({
         url: 'server/upload/url', //upload.php script, node.js route, or servlet url
         // method: POST or PUT,
         // headers: {'headerKey': 'headerValue'}, withCredential: true,
         data: {myObj: $scope.myModelObj},
-        file: $file,
+        file: file,
+        // file: $files, //upload multiple files, this feature only works in HTML5 FromData browsers
         /* set file formData name for 'Content-Desposition' header. Default: 'file' */
         //fileFormDataName: myFile,
         /* customize how data is added to formData. See #40#issuecomment-28612000 for example */
@@ -70,13 +71,15 @@ var MyCtrl = [ '$scope', '$upload', function($scope, $upload) {
 }];
 ```
 
-Note: `angular.file-upload-shim.js` must be loaded before `angular.js` and is only needed if you are supporting non-HTML5 FormData browsers or you need the support for upload progress or cancel.
+**Note**: `angular.file-upload-shim.js` must be loaded before `angular.js` and is only needed if you are supporting non-HTML5 FormData browsers or you need the support for upload progress or cancel.
 
+**Upload multiple files**: Only for HTML5 FormData browsers (not IE8-9) if you pass an array of files to `file` option it will upload all of them together in one request. The formData file name will have the index appended to it (i.e. `file0`, `file1`, etc.). If you want it cross browser you need to iterate through files and upload them one by one like the code above.
 
 ## Old browsers
 
 For browsers not supporting HTML5 FormData (IE8, IE9, ...) [FileAPI](https://github.com/mailru/FileAPI) module is used. 
 For these browsers these two files are needed:  **`FileAPI.min.js`, `FileAPI.flash.swf`** which will be loaded if the browser does not supports HTML5 FormData (no extra load for HTML5 browsers).
+
 **Note**: Flash needs to be installed on the client browser since `FileAPI` uses Flash to upload files.
 
 You can put these two files beside `angular-file-upload-shim(.min).js` on your server to be loaded automatically on demand or use the following script to set the FileAPI load path (optional):
@@ -88,7 +91,7 @@ You can put these two files beside `angular-file-upload-shim(.min).js` on your s
         staticPath: '/flash/FileAPI.flash.swf/folder/'
     }
 </script>
-<script src="angular.file-upload-shim.min.js"></script>...
+<script src="angular-file-upload-shim.min.js"></script>...
 ```
 
 ## Install
