From b03869d385e6c21885565c8eb09d8d89e4ac3e10 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Wed, 28 Oct 2015 23:37:32 +0800 Subject: [PATCH] fix(ng-file-upload): allow File[] in upload config File[] is allowed to be used in IFileUploadConfig. --- ng-file-upload/ng-file-upload-tests.ts | 2 +- ng-file-upload/ng-file-upload.d.ts | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ng-file-upload/ng-file-upload-tests.ts b/ng-file-upload/ng-file-upload-tests.ts index f55272295f..6ff4404025 100644 --- a/ng-file-upload/ng-file-upload-tests.ts +++ b/ng-file-upload/ng-file-upload-tests.ts @@ -40,7 +40,7 @@ module controllers { .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) => { + .success((data: any, status: number, headers: any, config: angular.angularFileUpload.IFileUploadConfigFile) => { // file is uploaded successfully console.log("Success!", data, status, headers, config); }); diff --git a/ng-file-upload/ng-file-upload.d.ts b/ng-file-upload/ng-file-upload.d.ts index d38c432262..79b1a91f1f 100644 --- a/ng-file-upload/ng-file-upload.d.ts +++ b/ng-file-upload/ng-file-upload.d.ts @@ -10,7 +10,7 @@ declare module angular.angularFileUpload { interface IUploadService { http(config: IRequestConfig): IUploadPromise; - upload(config: IFileUploadConfig): IUploadPromise; + upload(config: IFileUploadConfigFiles|IFileUploadConfigFile): IUploadPromise; } interface IUploadPromise extends IHttpPromise { @@ -19,14 +19,25 @@ declare module angular.angularFileUpload { xhr(callback: IHttpPromiseCallback): IUploadPromise; } - interface IFileUploadConfig extends IRequestConfig { + interface IFileUploadConfigFile extends IRequestConfig { file: File; fileName?: string; } + interface IFileUploadConfigFiles extends IRequestConfig { + + file: File[]; + fileName?: string; + } + + interface IFilesProgressEvent extends ProgressEvent { + + config: IFileUploadConfigFiles; + } + interface IFileProgressEvent extends ProgressEvent { - config: IFileUploadConfig; + config: IFileUploadConfigFile; } -} \ No newline at end of file +}