FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix configuration loading
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2019-12-19 17:03:10 +01:00
parent fd8025c674
commit 677608c14d
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/common/src/fm/shared/app.config.ts
View File

@ -1,5 +1,5 @@
import {Inject, Injectable} from '@angular/core'; import {Inject, Injectable} from '@angular/core';
import { Location } from '@angular/common'; import { Location,PathLocationStrategy } from '@angular/common';
import {HttpClient, HttpXhrBackend} from '@angular/common/http'; import {HttpClient, HttpXhrBackend} from '@angular/common/http';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
@ -22,7 +22,9 @@ export class AppConfig {
} }
public load(): Promise<any> { public load(): Promise<any> {
return this.httpClient.get(this.location.prepareExternalUrl('/configuration.json')) var url = this.location.prepareExternalUrl('/configuration.json');
if(url.startsWith("#")) url='/configuration.json';
return this.httpClient.get(url)
.toPromise() .toPromise()
.then(data => { .then(data => {
this.config = data; this.config = data;