Code fixes after merge

This commit is contained in:
Denys Vuika
2016-09-05 09:33:42 +01:00
parent c037b91c9c
commit 8159cc1dd9
4 changed files with 6 additions and 7 deletions

View File

@@ -20,7 +20,6 @@ import { Response } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { AlfrescoApiService } from 'ng2-alfresco-core';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { FileModel } from '../models/file.model';
/**
@@ -45,7 +44,7 @@ export class UploadService {
filesUpload$: Observable<FileModel[]>;
totalCompleted$: Observable<any>;
constructor(private authService: AlfrescoAuthenticationService) {
constructor(private apiService: AlfrescoApiService) {
this.filesUpload$ = new Observable<FileModel[]>(observer => this.filesUploadObserverProgressBar = observer).share();
this.totalCompleted$ = new Observable<number>(observer => this.totalCompletedObserver = observer).share();
}
@@ -106,7 +105,7 @@ export class UploadService {
filesToUpload.forEach((uploadingFileModel: FileModel) => {
uploadingFileModel.setUploading();
let promiseUpload = this.authService.getAlfrescoApi().upload.uploadFile(uploadingFileModel.file, directory, null, null, opts)
let promiseUpload = this.apiService.getInstance().upload.uploadFile(uploadingFileModel.file, directory, null, null, opts)
.on('progress', (progress: any) => {
uploadingFileModel.setProgres(progress);
this.updateFileListStream(this.queue);