- Update Travis configuration;

.travis.yml

@@ -1,11 +1,13 @@
 language: node_js
 node_js:
-  - "6"
+  - "10.15.0"
+
+sudo: required
+services:
+  - xvfb
 
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 script:
   - npm run pretest
@@ -15,6 +17,7 @@ after_success:
   - ./node_modules/.bin/codecov
 
 addons:
+  chrome: stable
   firefox: "latest"
   apt:
     sources:

karma.conf.js

@@ -48,6 +48,7 @@ module.exports = function (config) {
 
   if (process.env.TRAVIS) {
     configuration.browsers = ['Chrome_travis_ci'];
+    configuration.singleRun = true;
   }
 
   if (process.env.SAUCE) {

package.json

@@ -84,8 +84,8 @@
     "jasmine-core": "2.5.2",
     "jasmine-data-provider": "2.2.0",
     "jasmine-spec-reporter": "3.2.0",
-    "karma": "1.4.0",
-    "karma-chrome-launcher": "^2.0.0",
+    "karma": "^4.2.0",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "^1.0.1",
     "karma-coverage-istanbul-reporter": "^1.3.0",
     "karma-jasmine": "^1.0.2",

src/file-upload/file-drop.directive.ts

@@ -1,12 +1,14 @@
-import { Directive, EventEmitter, ElementRef, HostListener, Input, Output } from '@angular/core';
+import { Directive, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core';
 
-import { FileUploader, FileUploaderOptions } from './file-uploader.class';
+import { FileUploader, FileUploaderOptions, FilterFunction } from './file-uploader.class';
 
 @Directive({ selector: '[ng2FileDrop]' })
 export class FileDropDirective {
   @Input() public uploader: FileUploader;
+  // tslint:disable-next-line:no-input-rename
+  @Input('ng2FileFilter') public filter: FilterFunction['fn'];
   @Output() public fileOver: EventEmitter<any> = new EventEmitter();
-  @Output() public onFileDrop: EventEmitter<File[]> = new EventEmitter<File[]>();
+  @Output() public onFileDrop: EventEmitter<FileList> = new EventEmitter<FileList>();
 
   protected element: ElementRef;
 
@@ -22,7 +24,7 @@ export class FileDropDirective {
     return {};
   }
 
-  @HostListener('drop', [ '$event' ])
+  @HostListener('drop', ['$event'])
   public onDrop(event: any): void {
     let transfer = this._getTransfer(event);
     if (!transfer) {
@@ -30,14 +32,17 @@ export class FileDropDirective {
     }
 
     let options = this.getOptions();
-    let filters = this.getFilters();
+    let filters = typeof this.filter === 'function' ? [{
+      name: 'ng2FileDropDirectiveFilter',
+      fn: this.filter
+    }, ...options.filters] : this.getFilters();
     this._preventAndStop(event);
     this.uploader.addToQueue(transfer.files, options, filters);
     this.fileOver.emit(false);
     this.onFileDrop.emit(transfer.files);
   }
 
-  @HostListener('dragover', [ '$event' ])
+  @HostListener('dragover', ['$event'])
   public onDragOver(event: any): void {
     let transfer = this._getTransfer(event);
     if (!this._haveFiles(transfer.types)) {
@@ -49,10 +54,10 @@ export class FileDropDirective {
     this.fileOver.emit(true);
   }
 
-  @HostListener('dragleave', [ '$event' ])
+  @HostListener('dragleave', ['$event'])
   public onDragLeave(event: any): any {
     if ((this as any).element) {
-      if (event.currentTarget === (this as any).element[ 0 ]) {
+      if (event.currentTarget === (this as any).element[0]) {
         return;
       }
     }
@@ -61,11 +66,11 @@ export class FileDropDirective {
     this.fileOver.emit(false);
   }
 
-  protected _getTransfer(event: any): any {
+  protected _getTransfer(event: any): DragEvent['dataTransfer'] {
     return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
   }
 
-  protected _preventAndStop(event: any): any {
+  protected _preventAndStop(event: Event): any {
     event.preventDefault();
     event.stopPropagation();
   }

src/file-upload/file-select.directive.ts

@@ -1,10 +1,12 @@
-import { Directive, EventEmitter, ElementRef, Input, HostListener, Output } from '@angular/core';
+import { Directive, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core';
 
-import { FileUploader } from './file-uploader.class';
+import { FileUploader, FilterFunction } from './file-uploader.class';
 
 @Directive({ selector: '[ng2FileSelect]' })
 export class FileSelectDirective {
   @Input() public uploader: FileUploader;
+  // tslint:disable-next-line:no-input-rename
+  @Input('ng2FileFilter') public filter: FilterFunction['fn'];
   @Output() public onFileSelected: EventEmitter<File[]> = new EventEmitter<File[]>();
 
   protected element: ElementRef;
@@ -29,7 +31,10 @@ export class FileSelectDirective {
   public onChange(): any {
     let files = this.element.nativeElement.files;
     let options = this.getOptions();
-    let filters = this.getFilters();
+    let filters = typeof this.filter === 'function' ? [{
+      name: 'ng2FileSelectDirectiveFilter',
+      fn: this.filter
+    }, ...options.filters] : this.getFilters();
 
     this.uploader.addToQueue(files, options, filters);
     this.onFileSelected.emit(files);

src/file-upload/file-uploader.class.ts

@@ -12,11 +12,11 @@ export interface Headers {
   value: string;
 }
 
-export type ParsedResponseHeaders = { [ headerFieldName: string ]: string };
+export type ParsedResponseHeaders = { [headerFieldName: string]: string };
 
-export type FilterFunction = {
-  name: string,
-  fn: (item?: FileLikeObject, options?: FileUploaderOptions) => boolean
+export interface FilterFunction {
+  name: string;
+  fn(this: FileUploader, item?: FileLikeObject, options?: FileUploaderOptions, queueIndex?: number): boolean | Promise<boolean>;
 };
 
 export interface FileUploaderOptions {
@@ -35,16 +35,16 @@ export interface FileUploaderOptions {
   disableMultipart?: boolean;
   itemAlias?: string;
   authTokenHeader?: string;
-  additionalParameter?: { [ key: string ]: any };
+  additionalParameter?: { [key: string]: any };
   parametersBeforeFiles?: boolean;
   formatDataFunction?: Function;
   formatDataFunctionIsAsync?: boolean;
-  parallelUploads?: number;
 }
 
 export class FileUploader {
 
   public authToken: string;
+  public isUploading: boolean = false;
   public queue: FileItem[] = [];
   public progress: number = 0;
   public _nextIndex: number = 0;
@@ -52,10 +52,6 @@ export class FileUploader {
   public authTokenHeader: string;
   public response: EventEmitter<any>;
 
-  public get isUploading(): boolean {
-    return this.queue.some((item: FileItem) => item.isUploading);
-  }
-
   public options: FileUploaderOptions = {
     autoUpload: false,
     isHTML5: true,
@@ -93,35 +89,39 @@ export class FileUploader {
       this.options.filters.unshift({ name: 'mimeType', fn: this._mimeTypeFilter });
     }
 
-    for (let item of this.queue) {
-      item.url = this.options.url;
+    for (const q of this.queue) {
+      q.url = this.options.url;
     }
   }
 
-  public addToQueue(files: File[], options?: FileUploaderOptions, filters?: FilterFunction[] | string): void {
+  public async addToQueue(files: FileList, options?: FileUploaderOptions, filters?: FilterFunction[] | string): Promise<void> {
     let list: File[] = [];
-    for (let file of files) {
-      list.push(file);
+    // tslint:disable-next-line:prefer-for-of
+    for (let i = 0; i < files.length; i++) {
+      list.push(files[i]);
     }
+
     let arrayOfFilters = this._getFilters(filters);
     let count = this.queue.length;
     let addedFileItems: FileItem[] = [];
-    list.map((some: File) => {
+    let idx = 0;
+
+    for (const some of list) {
       if (!options) {
         options = this.options;
       }
 
       let temp = new FileLikeObject(some);
-      if (this._isValidFile(temp, arrayOfFilters, options)) {
+      if (await this._isValidFile(temp, arrayOfFilters, options, idx++)) {
         let fileItem = new FileItem(this, some, options);
         addedFileItems.push(fileItem);
         this.queue.push(fileItem);
         this._onAfterAddingFile(fileItem);
       } else {
-        let filter = arrayOfFilters[ this._failFilterIndex ];
+        let filter = arrayOfFilters[this._failFilterIndex];
         this._onWhenAddingFileFailed(temp, filter, options);
       }
-    });
+    }
     if (this.queue.length !== count) {
       this._onAfterAddingAll(addedFileItems);
       this.progress = this._getTotalProgress();
@@ -134,7 +134,7 @@ export class FileUploader {
 
   public removeFromQueue(value: FileItem): void {
     let index = this.getIndexOfItem(value);
-    let item = this.queue[ index ];
+    let item = this.queue[index];
     if (item.isUploading) {
       item.cancel();
     }
@@ -144,22 +144,26 @@ export class FileUploader {
 
   public clearQueue(): void {
     while (this.queue.length) {
-      this.queue[ 0 ].remove();
+      this.queue[0].remove();
     }
     this.progress = 0;
   }
 
   public uploadItem(value: FileItem): void {
     let index = this.getIndexOfItem(value);
-    let item = this.queue[ index ];
+    let item = this.queue[index];
     let transport = this.options.isHTML5 ? '_xhrTransport' : '_iframeTransport';
     item._prepareToUploading();
-    (this as any)[ transport ](item);
+    if (this.isUploading) {
+      return;
+    }
+    this.isUploading = true;
+    (this as any)[transport](item);
   }
 
   public cancelItem(value: FileItem): void {
     let index = this.getIndexOfItem(value);
-    let item = this.queue[ index ];
+    let item = this.queue[index];
     let prop = this.options.isHTML5 ? item._xhr : item._form;
     if (item && item.isUploading) {
       prop.abort();
@@ -172,10 +176,7 @@ export class FileUploader {
       return;
     }
     items.map((item: FileItem) => item._prepareToUploading());
-    let numberUploadsToStart = Math.min(items.length, this.options.parallelUploads || 1);
-    for (let i = 0; i < numberUploadsToStart; ++i) {
-      items[ i ].upload();
-    }
+    items[0].upload();
   }
 
   public cancelAll(): void {
@@ -278,7 +279,8 @@ export class FileUploader {
   public _onCompleteItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
     item._onComplete(response, status, headers);
     this.onCompleteItem(item, response, status, headers);
-    let nextItem = this.getReadyItems()[ 0 ];
+    let nextItem = this.getReadyItems()[0];
+    this.isUploading = false;
     if (nextItem) {
       nextItem.upload();
       return;
@@ -291,7 +293,7 @@ export class FileUploader {
   protected _headersGetter(parsedHeaders: ParsedResponseHeaders): any {
     return (name: any): any => {
       if (name) {
-        return parsedHeaders[ name.toLowerCase() ] || void 0;
+        return parsedHeaders[name.toLowerCase()] || void 0;
       }
       return parsedHeaders;
     };
@@ -318,7 +320,7 @@ export class FileUploader {
       // For AWS, Additional Parameters must come BEFORE Files
       if (this.options.additionalParameter !== undefined) {
         Object.keys(this.options.additionalParameter).forEach((key: string) => {
-          let paramVal = this.options.additionalParameter[ key ];
+          let paramVal = this.options.additionalParameter[key];
           // Allow an additional parameter to include the filename
           if (typeof paramVal === 'string' && paramVal.indexOf('{{file_name}}') >= 0) {
             paramVal = paramVal.replace('{{file_name}}', item.file.name);
@@ -343,7 +345,7 @@ export class FileUploader {
       let response = this._transformResponse(xhr.response, headers);
       let gist = this._isSuccessCode(xhr.status) ? 'Success' : 'Error';
       let method = '_on' + gist + 'Item';
-      (this as any)[ method ](item, response, xhr.status, headers);
+      (this as any)[method](item, response, xhr.status, headers);
       this._onCompleteItem(item, response, xhr.status, headers);
     };
     xhr.onerror = () => {
@@ -373,11 +375,11 @@ export class FileUploader {
     if (this.authToken) {
       xhr.setRequestHeader(this.authTokenHeader, this.authToken);
     }
-    xhr.onreadystatechange = function () {
-      if (xhr.readyState == XMLHttpRequest.DONE) {
+    xhr.onreadystatechange = function (): void {
+      if (xhr.readyState === XMLHttpRequest.DONE) {
         that.response.emit(xhr.responseText);
       }
-    }
+    };
     if (this.options.formatDataFunctionIsAsync) {
       sendable.then(
         (result: any) => xhr.send(JSON.stringify(result))
@@ -422,12 +424,18 @@ export class FileUploader {
     return this.options.queueLimit === undefined || this.queue.length < this.options.queueLimit;
   }
 
-  protected _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions): boolean {
+  protected async _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions, queueIndex: number): Promise<boolean> {
     this._failFilterIndex = -1;
-    return !filters.length ? true : filters.every((filter: FilterFunction) => {
+
+    for (const filter of filters) {
       this._failFilterIndex++;
-      return filter.fn.call(this, file, options);
-    });
+
+      if (!(await Promise.resolve(filter.fn.call(this, file, options, queueIndex)))) {
+        return false;
+      }
+    }
+
+    return true;
   }
 
   protected _isSuccessCode(status: number): boolean {
@@ -451,7 +459,7 @@ export class FileUploader {
       key = line.slice(0, i).trim().toLowerCase();
       val = line.slice(i + 1).trim();
       if (key) {
-        parsed[ key ] = parsed[ key ] ? parsed[ key ] + ', ' + val : val;
+        parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
       }
     });
     return parsed;