[ADF-2569] fix reload app.config.json (#3124)

* fix reload app.config.json

* improve style mobile
fix test

* test karma setup update

* fix core providers test

* remove unused providers

* use mock api in service test

* skip test in the wrong place

* remove comma

* remove fdescribe
This commit is contained in:
Eugenio Romano
2018-03-28 11:01:04 +01:00
committed by Denys Vuika
parent 21b8cd30ce
commit 9e2969b955
93 changed files with 228 additions and 436 deletions

View File

@@ -31,7 +31,7 @@ export class AppConfigService {
ecmHost: 'http://{hostname}{:port}/ecm',
bpmHost: 'http://{hostname}{:port}/bpm',
logLevel: 'silent',
alfrescoRepositoryName : 'alfresco-1'
alfrescoRepositoryName: 'alfresco-1'
};
constructor(private http: HttpClient) {
@@ -60,8 +60,8 @@ export class AppConfigService {
return location.port ? prefix + location.port : '';
}
async load(): Promise<any> {
await new Promise(resolve => {
load(): Promise<any> {
return new Promise(resolve => {
this.http.get('app.config.json').subscribe(
(data: any) => {
this.config = Object.assign({}, this.config, data || {});