From 64a82fe17684b2fbbbac82204ebd0018f45f6edc Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 19 Nov 2018 12:43:07 +0100
Subject: [PATCH] chore: prettify raceFetch
---
src/atlasViewer/atlasViewer.constantService.service.ts | 2 +-
src/atlasViewer/atlasViewer.dataService.service.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/atlasViewer/atlasViewer.constantService.service.ts b/src/atlasViewer/atlasViewer.constantService.service.ts
index 88ccf6f51..2abfe5f1d 100644
--- a/src/atlasViewer/atlasViewer.constantService.service.ts
+++ b/src/atlasViewer/atlasViewer.constantService.service.ts
@@ -32,7 +32,7 @@ export class AtlasViewerConstantsServices{
fetch(url),
new Promise((_, reject) => setTimeout(() => {
reject(`fetch did not resolve under ${this.TIMEOUT} ms`)
- }, this.TIMEOUT))
+ }, this.TIMEOUT)) as Promise<Response>
])
/* TODO to be replaced by @id: Landmark/UNIQUE_ID in KG in the future */
diff --git a/src/atlasViewer/atlasViewer.dataService.service.ts b/src/atlasViewer/atlasViewer.dataService.service.ts
index b6bab5294..34362e294 100644
--- a/src/atlasViewer/atlasViewer.dataService.service.ts
+++ b/src/atlasViewer/atlasViewer.dataService.service.ts
@@ -35,13 +35,13 @@ export class AtlasViewerDataService implements OnDestroy{
){
this.constantService.templateUrls.map(url =>
this.constantService.raceFetch(url)
- .then((res: Response) => res.json())
+ .then(res => res.json())
.then(json => new Promise((resolve, reject) => {
if(json.nehubaConfig)
resolve(json)
else if(json.nehubaConfigURL)
this.constantService.raceFetch(json.nehubaConfigURL)
- .then((res: Response) => res.json())
+ .then(res => res.json())
.then(json2 => resolve(
Object.assign({}, json, { nehubaConfig: json2 })
))
--
GitLab