From c3139e71f07b674722177814f7af71a3f639d99a Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Thu, 23 May 2019 12:20:47 +0200
Subject: [PATCH] chore: clean up code
---
src/atlasViewer/atlasViewer.constantService.service.ts | 3 +++
src/atlasViewer/atlasViewer.template.html | 2 +-
src/components/toast/toast.template.html | 3 ++-
src/res/css/extra_styles.css | 5 +++++
.../databrowser/databrowser.template.html | 2 +-
.../nehubaViewer/nehubaViewer.component.ts | 1 -
src/ui/signinBanner/signinBanner.components.ts | 1 +
src/util/directives/toastContainer.directive.ts | 9 +++++----
8 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/atlasViewer/atlasViewer.constantService.service.ts b/src/atlasViewer/atlasViewer.constantService.service.ts
index 2c13b1ab7..47f220b7b 100644
--- a/src/atlasViewer/atlasViewer.constantService.service.ts
+++ b/src/atlasViewer/atlasViewer.constantService.service.ts
@@ -259,6 +259,9 @@ Interactive atlas viewer requires **webgl2.0**, and the \`EXT_color_buffer_float
})
}
+ /**
+ * TODO deprecate
+ */
const meta = 'res/json/allAggregatedData.json'
fetch(meta)
diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html
index e6f5ac669..aff1c05c7 100644
--- a/src/atlasViewer/atlasViewer.template.html
+++ b/src/atlasViewer/atlasViewer.template.html
@@ -81,7 +81,7 @@
</cookie-agreement>
</div>
</tab>
- <tab heading="KG ToS">
+ <tab heading="Terms of Use">
<div class="mt-2">
<kgtos-component>
</kgtos-component>
diff --git a/src/components/toast/toast.template.html b/src/components/toast/toast.template.html
index 6d1450269..95032c74b 100644
--- a/src/components/toast/toast.template.html
+++ b/src/components/toast/toast.template.html
@@ -15,8 +15,9 @@
</div>
<div
(click)="dismiss($event)"
+ class="ml-2"
*ngIf="dismissable" close>
- <i class="fas fa-remove"></i>
+ <i class="fas fa-times"></i>
</div>
<timer-component
*ngIf="timeout > 0"
diff --git a/src/res/css/extra_styles.css b/src/res/css/extra_styles.css
index a49851895..1f176a851 100644
--- a/src/res/css/extra_styles.css
+++ b/src/res/css/extra_styles.css
@@ -262,6 +262,11 @@ markdown-dom pre code
border-bottom-color: rgba(0, 0, 0, 0.8);
}
+.darktheme.popover.popover-right>.arrow::after
+{
+ border-right-color: rgba(0, 0, 0, 0.8);
+}
+
.r-90
{
transform: rotate(90deg)!important;
diff --git a/src/ui/databrowserModule/databrowser/databrowser.template.html b/src/ui/databrowserModule/databrowser/databrowser.template.html
index 890576252..515a94d83 100644
--- a/src/ui/databrowserModule/databrowser/databrowser.template.html
+++ b/src/ui/databrowserModule/databrowser/databrowser.template.html
@@ -29,7 +29,7 @@
<!-- modality picker -->
<div>
<span
- placement="bottom"
+ placement="right"
container="body"
[popover]="countedDataM.length > 0 ? modalityPicker : null"
[outsideClick]="true"
diff --git a/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts b/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts
index 28a41e61f..a15fd4427 100644
--- a/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts
+++ b/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts
@@ -480,7 +480,6 @@ export class NehubaViewerUnit implements OnDestroy{
}
private filterLayers(l:any,layerObj:any):boolean{
- debugger
/**
* if selector is an empty object, select all layers
*/
diff --git a/src/ui/signinBanner/signinBanner.components.ts b/src/ui/signinBanner/signinBanner.components.ts
index e3870a457..798b5f1f1 100644
--- a/src/ui/signinBanner/signinBanner.components.ts
+++ b/src/ui/signinBanner/signinBanner.components.ts
@@ -97,6 +97,7 @@ export class SigninBanner implements OnInit, OnDestroy{
})
}
+ // TODO handle mobile
handleRegionClick({ mode = 'single', region }){
if (!region)
return
diff --git a/src/util/directives/toastContainer.directive.ts b/src/util/directives/toastContainer.directive.ts
index 162e3c6d7..f32c53462 100644
--- a/src/util/directives/toastContainer.directive.ts
+++ b/src/util/directives/toastContainer.directive.ts
@@ -17,11 +17,12 @@ export class ToastContainerDirective{
){
const toastComponentFactory = this.cfr.resolveComponentFactory(ToastComponent)
- this.toastService.showToast = (message, config) => {
+ this.toastService.showToast = (message, config = {}) => {
- const _config = Object.assign({}, defaultToastConfig, config
- ? config
- : {})
+ const _config = {
+ ...defaultToastConfig,
+ ...config
+ }
const toastComponent = this.viewContainerRef.createComponent(toastComponentFactory)
if(typeof message === 'string')
toastComponent.instance.message = message
--
GitLab