Skip to content

Commit

Permalink
chore(release): 3.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuri committed Jul 30, 2017
1 parent 335dbc0 commit f933cfa
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-uploader",
"version": "3.3.3",
"version": "3.3.4",
"main": "bundles/ngx-uploader.umd.js",
"module": "index.js",
"esnext": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/components/app-home/app-home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class AppHomeComponent {
method: 'POST',
data: { foo: 'bar' },
concurrency: this.formData.concurrency
}
};

this.uploadInput.emit(event);
}
Expand Down
8 changes: 6 additions & 2 deletions src/ngx-uploader/classes/ngx-uploader.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,12 @@ export class NgUploaderService {
break;
case 'uploadAll':
const concurrency = event.concurrency > 0 ? event.concurrency : Number.POSITIVE_INFINITY;
const files = this.files.filter(file => file.progress.status !== UploadStatus.Done);
Observable.from(files.map(file => this.uploadFile(file, event)))
const files = this.files.filter(file => file.progress.status === UploadStatus.Queue);
if (!files.length) {
return;
}

Observable.from(files.map(file => file.sub = this.uploadFile(file, event)))
.mergeAll(concurrency)
.subscribe((data: UploadOutput) => this.serviceEvents.emit(data));
break;
Expand Down
1 change: 0 additions & 1 deletion src/ngx-uploader/directives/ng-file-select.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,5 @@ export class NgFileSelectDirective implements OnInit, OnDestroy {

fileListener = () => {
this.upload.handleFiles(this.el.files);
this.el.value = '';
}
}

0 comments on commit f933cfa

Please sign in to comment.