From f275bd2ed5814e1c881b47f8211852c56db9d826 Mon Sep 17 00:00:00 2001 From: Chris Barr Date: Wed, 20 May 2015 08:37:26 -0400 Subject: [PATCH 1/3] (angular-file-upload) Adding missing a typedef for progress event --- angular-file-upload/angular-file-upload.d.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/angular-file-upload/angular-file-upload.d.ts b/angular-file-upload/angular-file-upload.d.ts index bd76a6e7ea..635180a540 100644 --- a/angular-file-upload/angular-file-upload.d.ts +++ b/angular-file-upload/angular-file-upload.d.ts @@ -23,4 +23,9 @@ declare module angular.angularFileUpload { file: File; fileName?: string; } + + interface IFileProgressEvent extends ProgressEvent { + + config: IFileUploadConfig; + } } From 0daffc5de026726e3248ac99165da6c3c1719d2d Mon Sep 17 00:00:00 2001 From: Chris Barr Date: Wed, 20 May 2015 09:01:09 -0400 Subject: [PATCH 2/3] Updating tests to match new defs & updating links in the defs --- .../angular-file-upload-tests.ts | 48 ++++++++++--------- angular-file-upload/angular-file-upload.d.ts | 10 ++-- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/angular-file-upload/angular-file-upload-tests.ts b/angular-file-upload/angular-file-upload-tests.ts index d59e65b4e2..8b8fe7490f 100644 --- a/angular-file-upload/angular-file-upload-tests.ts +++ b/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[] = []; + // $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({ - 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); + }); + } } } diff --git a/angular-file-upload/angular-file-upload.d.ts b/angular-file-upload/angular-file-upload.d.ts index 635180a540..499fdf185e 100644 --- a/angular-file-upload/angular-file-upload.d.ts +++ b/angular-file-upload/angular-file-upload.d.ts @@ -1,6 +1,6 @@ -// Type definitions for Angular File Upload 1.6.7 -// Project: https://github.com/danialfarid/angular-file-upload -// Definitions by: John Reilly +// Type definitions for Angular File Upload 4.2.1 +// Project: https://github.com/danialfarid/ng-file-upload +// Definitions by: John Reilly & Chris Barr // Definitions: https://github.com/borisyankov/DefinitelyTyped /// @@ -23,9 +23,9 @@ declare module angular.angularFileUpload { file: File; fileName?: string; } - + interface IFileProgressEvent extends ProgressEvent { config: IFileUploadConfig; } -} +} \ No newline at end of file From c3125d7aebd46b9bd024287b12eaf3438cc500c1 Mon Sep 17 00:00:00 2001 From: Chris Barr Date: Fri, 22 May 2015 07:50:50 -0400 Subject: [PATCH 3/3] Fixing header format --- angular-file-upload/angular-file-upload.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular-file-upload/angular-file-upload.d.ts b/angular-file-upload/angular-file-upload.d.ts index 499fdf185e..fa7aaa54e3 100644 --- a/angular-file-upload/angular-file-upload.d.ts +++ b/angular-file-upload/angular-file-upload.d.ts @@ -1,6 +1,6 @@ // Type definitions for Angular File Upload 4.2.1 // Project: https://github.com/danialfarid/ng-file-upload -// Definitions by: John Reilly & Chris Barr +// Definitions by: John Reilly // Definitions: https://github.com/borisyankov/DefinitelyTyped ///