fix: set uploaderClass from directives

kukhariev · Sep 2, 2019 · 9a6400b · 9a6400b
1 parent b61e05a
commit 9a6400b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/uploadx/src/uploader.ts b/src/uploadx/src/uploader.ts
@@ -242,6 +242,7 @@ export abstract class Uploader implements UploadState {
   }
 
   protected abort(): void {
+    this.offset = undefined;
     this._xhr && this._xhr.abort();
   }
 

diff --git a/src/uploadx/src/uploadx.service.ts b/src/uploadx/src/uploadx.service.ts
@@ -36,7 +36,6 @@ export class UploadxService {
     endpoint: '/upload',
     autoUpload: true,
     concurrency: 2,
-    uploaderClass: UploaderX,
     stateChange: (evt: Uploader) => {
       setTimeout(() =>
         this.ngZone.run(() => this.eventsStream.next(pick(evt, UploadxService.stateKeys)))
@@ -102,11 +101,9 @@ export class UploadxService {
   }
 
   private addUploaderInstance(file: File, options: UploadxOptions): void {
-    if (this.options.uploaderClass) {
-      const uploader = new this.options.uploaderClass(file, options as UploaderOptions);
-      this.queue.push(uploader);
-      uploader.status = 'added';
-    }
+    const uploader = new (options.uploaderClass || UploaderX)(file, options as UploaderOptions);
+    this.queue.push(uploader);
+    uploader.status = 'added';
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -242,6 +242,7 @@ export abstract class Uploader implements UploadState { @@
       }
       protected abort(): void {
+        this.offset = undefined;
         this._xhr && this._xhr.abort();
       }
@@ Expand Down @@