Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit

This commit is contained in:
Peter Bastiani 2021-05-04 11:28:49 +02:00
commit 8d723477d3

View File

@ -71,7 +71,7 @@ export class ResumableFileUploadService implements OnDestroy{
if(file) { if(file) {
var parts = state.url.split("/"); var parts = state.url.split("/");
file.itemCode = parts[parts.length-1]; file.itemCode = parts[parts.length-1];
file.progress = (state.progress?state.progress:0); file.progress = (state.progress?state.progress:0);
file.success=true; file.success=true;
} }
};break; };break;
@ -109,7 +109,10 @@ export class ResumableFileUploadService implements OnDestroy{
}; };
doClose = function () { doClose = function () {
this.uploadService.control({action:'cancelAll'}); var toCancel = this.files.filter((f) => !f.success);
toCancel.forEach(f => {
this.uploadService.control({action:'cancel',uploadId:f.identifier});
});
this.files = new Array<File>(); this.files = new Array<File>();
this.isClosed = true; this.isClosed = true;
} }