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

Code fixes after merge

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
ng2-components/ng2-activiti-form/package.json
View File

@@ -65,7 +65,7 @@
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12", "zone.js": "0.6.12",
"ng2-translate": "2.2.2", "ng2-translate": "2.2.2",
"ng2-alfresco-core": "0.3.0" "ng2-alfresco-core": "^0.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"material-design-icons": "^2.2.3", "material-design-icons": "^2.2.3",
@@ -83,7 +83,6 @@
"karma-jasmine": "1.0.2", "karma-jasmine": "1.0.2",
"karma-jasmine-ajax": "0.1.13", "karma-jasmine-ajax": "0.1.13",
"karma-jasmine-html-reporter": "0.2.0", "karma-jasmine-html-reporter": "0.2.0",
"karma-jasmine-ajax": "0.1.13",
"karma-mocha-reporter": "2.0.3", "karma-mocha-reporter": "2.0.3",
"license-check": "1.1.5", "license-check": "1.1.5",
"remap-istanbul": "0.6.3", "remap-istanbul": "0.6.3",

4
ng2-components/ng2-activiti-form/src/services/node.service.ts
View File

@@ -70,7 +70,9 @@ export class NodeService {
relativePath: path relativePath: path
}; };
return Observable.fromPromise(this.authService.getAlfrescoApi().nodes.addNode('-root-', body, {})); // TODO: requires update to alfresco-js-api typings
let apiService: any = this.authService.getAlfrescoApi();
return Observable.fromPromise(apiService.nodes.addNode('-root-', body, {}));
} }
private generateUuid() { private generateUuid() {

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

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

1
ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts
View File

@@ -23,7 +23,6 @@ import { NotSupportedFormat } from './notSupportedFormat.component';
import { DOCUMENT } from '@angular/platform-browser'; import { DOCUMENT } from '@angular/platform-browser';
import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { AlfrescoApiService } from 'ng2-alfresco-core'; import { AlfrescoApiService } from 'ng2-alfresco-core';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
declare let __moduleName: string; declare let __moduleName: string;