Merge pull request DefinitelyTyped#4407 from chrismbarr/patch-6

(angular-file-upload) Adding missing a typedef for progress event

Author: horiuchi

angular-file-upload/angular-file-upload-tests.ts

@@ -10,35 +10,37 @@ module controllers {
 
         static $inject = ["$upload"];
         constructor(
-            private $upload: ng.angularFileUpload.IUploadService
+            private $upload: angular.angularFileUpload.IUploadService
             ) {
         }
 
         onFileSelect($files: File[]) {
-            //$files: an array of files selected, each file has name, size, and type.
-            var uploads: ng.IPromise<any>[] = [];
+            // $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];
-                uploads.push(this.$upload.upload<any>({
-                    url: "/api/upload",
-                    method: "POST",
-                    data: {
-                        extraData: {
-                            fileName: file.name, test: "anything"
-                        }
-                    },
-                    file: file
-                })
-                .progress((evt: any) => {
-                    console.log('progress');
-                })
-                .then(success => {
-                    // file is uploaded successfully
-                    console.log(success.data);
-                })
-                .catch(err => {
-                    console.error(err);
-                }));
+	            this.$upload.upload({
+			        url: "/api/upload",
+			        method: "POST",
+			        data: {
+				        extraData: {
+					        fileName: file.name,
+					        test: "anything"
+				        }
+			        },
+			        file: file
+		        })
+		        .progress((evt: angular.angularFileUpload.IFileProgressEvent) => {
+			        var percent = parseInt((100.0 * evt.loaded / evt.total).toString(), 10);
+			        console.log("upload progress: " + percent + "% for " + evt.config.file.name);
+		        })
+		        .error((data: any, status: number, response: any, headers: any) => {
+			        console.error(data, status, response, headers);
+		        })
+				.success((data: any, status: number, headers: any, config: angular.angularFileUpload.IFileUploadConfig) => {
+			        // file is uploaded successfully
+					console.log("Success!", data, status, headers, config);
+		        });
+
             }
         }
     }

angular-file-upload/angular-file-upload.d.ts

@@ -1,5 +1,5 @@
-// Type definitions for Angular File Upload 1.6.7
-// Project: https://github.com/danialfarid/angular-file-upload
+// Type definitions for Angular File Upload 4.2.1
+// Project: https://github.com/danialfarid/ng-file-upload
 // Definitions by: John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
@@ -23,4 +23,9 @@ declare module angular.angularFileUpload  {
         file: File;
         fileName?: string;
     }
-} 
+
+    interface IFileProgressEvent extends ProgressEvent {
+
+        config: IFileUploadConfig;
+    }
+}