allow to specify number of parallel uploads

.travis.yml

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

karma.conf.js

@@ -48,7 +48,6 @@ 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": "^4.2.0",
+    "karma": "1.4.0",
-    "karma-chrome-launcher": "^3.1.0",
+    "karma-chrome-launcher": "^2.0.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,14 +1,12 @@
-import { Directive, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core';
+import { Directive, EventEmitter, ElementRef, HostListener, Input, Output } from '@angular/core';
 
-import { FileUploader, FileUploaderOptions, FilterFunction } from './file-uploader.class';
+import { FileUploader, FileUploaderOptions } 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<FileList> = new EventEmitter<FileList>();
+  @Output() public onFileDrop: EventEmitter<File[]> = new EventEmitter<File[]>();
 
   protected element: ElementRef;
 
@@ -32,10 +30,7 @@ export class FileDropDirective {
     }
 
     let options = this.getOptions();
-    let filters = typeof this.filter === 'function' ? [{
+    let filters = this.getFilters();
-      name: 'ng2FileDropDirectiveFilter',
-      fn: this.filter
-    }, ...options.filters] : this.getFilters();
     this._preventAndStop(event);
     this.uploader.addToQueue(transfer.files, options, filters);
     this.fileOver.emit(false);
@@ -66,11 +61,11 @@ export class FileDropDirective {
     this.fileOver.emit(false);
   }
 
-  protected _getTransfer(event: any): DragEvent['dataTransfer'] {
+  protected _getTransfer(event: any): any {
     return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
   }
 
-  protected _preventAndStop(event: Event): any {
+  protected _preventAndStop(event: any): any {
     event.preventDefault();
     event.stopPropagation();
   }

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

@@ -1,12 +1,10 @@
-import { Directive, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core';
+import { Directive, EventEmitter, ElementRef, Input, HostListener, Output } from '@angular/core';
 
-import { FileUploader, FilterFunction } from './file-uploader.class';
+import { FileUploader } 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;
@@ -31,10 +29,7 @@ export class FileSelectDirective {
   public onChange(): any {
     let files = this.element.nativeElement.files;
     let options = this.getOptions();
-    let filters = typeof this.filter === 'function' ? [{
+    let filters = this.getFilters();
-      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

@@ -14,9 +14,9 @@ export interface Headers {
 
 export type ParsedResponseHeaders = { [ headerFieldName: string ]: string };
 
-export interface FilterFunction {
+export type FilterFunction = {
-  name: string;
+  name: string,
-  fn(this: FileUploader, item?: FileLikeObject, options?: FileUploaderOptions, queueIndex?: number): boolean | Promise<boolean>;
+  fn: (item?: FileLikeObject, options?: FileUploaderOptions) => boolean
 };
 
 export interface FileUploaderOptions {
@@ -39,12 +39,12 @@ export interface FileUploaderOptions {
   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,6 +52,10 @@ 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,
@@ -89,30 +93,26 @@ export class FileUploader {
       this.options.filters.unshift({ name: 'mimeType', fn: this._mimeTypeFilter });
     }
 
-    for (const q of this.queue) {
+    for (let item of this.queue) {
-      q.url = this.options.url;
+      item.url = this.options.url;
     }
   }
 
-  public async addToQueue(files: FileList, options?: FileUploaderOptions, filters?: FilterFunction[] | string): Promise<void> {
+  public addToQueue(files: File[], options?: FileUploaderOptions, filters?: FilterFunction[] | string): void {
     let list: File[] = [];
-    // tslint:disable-next-line:prefer-for-of
+    for (let file of files) {
-    for (let i = 0; i < files.length; i++) {
+      list.push(file);
-      list.push(files[i]);
     }
-
     let arrayOfFilters = this._getFilters(filters);
     let count = this.queue.length;
     let addedFileItems: FileItem[] = [];
-    let idx = 0;
+    list.map((some: File) => {
-
-    for (const some of list) {
       if (!options) {
         options = this.options;
       }
 
       let temp = new FileLikeObject(some);
-      if (await this._isValidFile(temp, arrayOfFilters, options, idx++)) {
+      if (this._isValidFile(temp, arrayOfFilters, options)) {
         let fileItem = new FileItem(this, some, options);
         addedFileItems.push(fileItem);
         this.queue.push(fileItem);
@@ -121,7 +121,7 @@ export class FileUploader {
         let filter = arrayOfFilters[ this._failFilterIndex ];
         this._onWhenAddingFileFailed(temp, filter, options);
       }
-    }
+    });
     if (this.queue.length !== count) {
       this._onAfterAddingAll(addedFileItems);
       this.progress = this._getTotalProgress();
@@ -154,10 +154,6 @@ export class FileUploader {
     let item = this.queue[ index ];
     let transport = this.options.isHTML5 ? '_xhrTransport' : '_iframeTransport';
     item._prepareToUploading();
-    if (this.isUploading) {
-      return;
-    }
-    this.isUploading = true;
     (this as any)[ transport ](item);
   }
 
@@ -176,7 +172,10 @@ export class FileUploader {
       return;
     }
     items.map((item: FileItem) => item._prepareToUploading());
-    items[0].upload();
+    let numberUploadsToStart = Math.min(items.length, this.options.parallelUploads || 1);
+    for (let i = 0; i < numberUploadsToStart; ++i) {
+      items[ i ].upload();
+    }
   }
 
   public cancelAll(): void {
@@ -280,7 +279,6 @@ export class FileUploader {
     item._onComplete(response, status, headers);
     this.onCompleteItem(item, response, status, headers);
     let nextItem = this.getReadyItems()[ 0 ];
-    this.isUploading = false;
     if (nextItem) {
       nextItem.upload();
       return;
@@ -375,11 +373,11 @@ export class FileUploader {
     if (this.authToken) {
       xhr.setRequestHeader(this.authTokenHeader, this.authToken);
     }
-    xhr.onreadystatechange = function (): void {
+    xhr.onreadystatechange = function () {
-      if (xhr.readyState === XMLHttpRequest.DONE) {
+      if (xhr.readyState == XMLHttpRequest.DONE) {
         that.response.emit(xhr.responseText);
       }
-    };
+    }
     if (this.options.formatDataFunctionIsAsync) {
       sendable.then(
         (result: any) => xhr.send(JSON.stringify(result))
@@ -424,18 +422,12 @@ export class FileUploader {
     return this.options.queueLimit === undefined || this.queue.length < this.options.queueLimit;
   }
 
-  protected async _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions, queueIndex: number): Promise<boolean> {
+  protected _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions): 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 {