inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when the dialog is not initialized

Browse Source
This commit is contained in:
mauriziovitale84
2016-08-12 16:52:30 +01:00
parent ac1010597f
commit 81220d17a3
3 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
View File

@@ -91,16 +91,11 @@ export class UploadService {
filesToUpload.forEach((uploadingFileModel: FileModel) => {
uploadingFileModel.setUploading();
let _filesUploadObserverProgressBar = this.filesUploadObserverProgressBar;
let _queue = this.queue;
let promiseUpload = this.authService.getAlfrescoApi().
upload.uploadFile(uploadingFileModel.file, directory)
.on('progress', (progress: any) => {
uploadingFileModel.setProgres(progress);
if (_filesUploadObserverProgressBar) {
_filesUploadObserverProgressBar.next(_queue);
}
this.updateFileListStream(this.queue);
})
.on('abort', () => {
uploadingFileModel.setAbort();
@@ -124,11 +119,9 @@ export class UploadService {
data.response
);
_filesUploadObserverProgressBar.next(_queue);
this.updateFileListStream(this.queue);
if (!uploadingFileModel.abort && !uploadingFileModel.error) {
if (this.totalCompletedObserver) {
this.totalCompletedObserver.next(++this.totalCompleted);
}
this.updateFileCounterStream(++this.totalCompleted);
}
});
@@ -182,4 +175,16 @@ export class UploadService {
console.error(error);
return Observable.throw(error || 'Server error');
}
private updateFileListStream(fileList: FileModel[]) {
if (this.filesUploadObserverProgressBar) {
this.filesUploadObserverProgressBar.next(fileList);
}
}
private updateFileCounterStream(total: number) {
if (this.totalCompletedObserver) {
this.totalCompletedObserver.next(total);
}
}
}