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

Merge pull request #917 from Alfresco/dev-eromano-916

Browse Source 
fix importing alfreso-js-api compatible with the version 0.3.6 #916
This commit is contained in:
Denys Vuika
2016-10-29 19:34:39 +01:00
committed by GitHub
parent cf8ada62c0 f8979f06c5
commit 5977e638ae
15 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts
View File

@@ -16,18 +16,18 @@
*/
import { Injectable } from '@angular/core';
import { AlfrescoJsApi } from 'alfresco-js-api';
import { AlfrescoApi } from 'alfresco-js-api';
@Injectable()
export class AlfrescoApiService {
private _instance: AlfrescoJsApi;
private _instance: AlfrescoApi;
public getInstance(): AlfrescoJsApi {
public getInstance(): AlfrescoApi {
return this._instance;
}
public setInstance(value: AlfrescoJsApi) {
public setInstance(value: AlfrescoApi) {
this._instance = value;
}

1
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts
View File

@@ -20,7 +20,6 @@ import { AlfrescoSettingsService } from './AlfrescoSettings.service';
import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service';
import { AlfrescoApiService } from './AlfrescoApi.service';
declare var AlfrescoApi: any;
declare let jasmine: any;
describe('AlfrescoAuthentication', () => {

12
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts
View File

@@ -19,17 +19,15 @@ import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { AlfrescoSettingsService } from './AlfrescoSettings.service';
import { AlfrescoApiService } from './AlfrescoApi.service';
import { AlfrescoJsApi } from 'alfresco-js-api';
declare var AlfrescoApi: AlfrescoJsApi;
import * as alfrescoApi from 'alfresco-js-api';
import { AlfrescoApi } from 'alfresco-js-api';
/**
* The AlfrescoAuthenticationService provide the login service and store the ticket in the localStorage
*/
@Injectable()
export class AlfrescoAuthenticationService {
alfrescoApi: AlfrescoJsApi;
alfrescoApi: AlfrescoApi;
/**
* Constructor
@@ -38,7 +36,7 @@ export class AlfrescoAuthenticationService {
*/
constructor(private settingsService: AlfrescoSettingsService,
private apiService: AlfrescoApiService) {
this.alfrescoApi = new AlfrescoApi({
this.alfrescoApi = <AlfrescoApi>new alfrescoApi({
provider: this.settingsService.getProviders(),
ticketEcm: this.getTicketEcm(),
ticketBpm: this.getTicketBpm(),
@@ -216,7 +214,7 @@ export class AlfrescoAuthenticationService {
return Observable.throw(error || 'Server error');
}
getAlfrescoApi(): AlfrescoJsApi {
getAlfrescoApi(): any {
return this.alfrescoApi;
}
}