From 2989628b7913383b39ac34c7db8666a21f8e5037 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 4 Jun 2021 13:31:41 +0200 Subject: Use HTML config when possible --- .../app/+about/about-instance/about-instance.component.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'client/src/app/+about/about-instance/about-instance.component.ts') diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index 5627aaa5a..f02048f39 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -2,10 +2,10 @@ import { ViewportScroller } from '@angular/common' import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute } from '@angular/router' import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' import { CustomMarkupService } from '@app/shared/shared-custom-markup' import { InstanceService } from '@app/shared/shared-instance' -import { About, ServerConfig } from '@shared/models' +import { About, HTMLServerConfig, ServerConfig } from '@shared/models' import { copyToClipboard } from '../../../root-helpers/utils' import { ResolverData } from './about-instance.resolver' @@ -35,16 +35,17 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked { languages: string[] = [] categories: string[] = [] - serverConfig: ServerConfig - initialized = false + private serverConfig: HTMLServerConfig + private lastScrollHash: string constructor ( private viewportScroller: ViewportScroller, private route: ActivatedRoute, private notifier: Notifier, + private serverService: ServerService, private instanceService: InstanceService ) {} @@ -61,9 +62,9 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked { } async ngOnInit () { - const { about, languages, categories, serverConfig }: ResolverData = this.route.snapshot.data.instanceData + const { about, languages, categories }: ResolverData = this.route.snapshot.data.instanceData - this.serverConfig = serverConfig + this.serverConfig = this.serverService.getHTMLConfig() this.languages = languages this.categories = categories -- cgit v1.2.3