Update P2P & Privacy paragraph

[github/Chocobozzz/PeerTube.git] / client / src / app / app.component.ts

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 6087dbf8038bf337022495dde014f3e4336458f9..fc4d6c6a27c4d5e92e29337d4b81ee85f5dab7f3 100644 (file)
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
 import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router'
 import { AuthService, RedirectService, ServerService } from '@app/core'
-import { isInSmallView } from '@app/shared/misc/utils'
 import { is18nPath } from '../../../shared/models/i18n'
+import { ScreenService } from '@app/shared/misc/screen.service'
 
 @Component({
   selector: 'my-app',
@@ -33,7 +33,8 @@ export class AppComponent implements OnInit {
     private authService: AuthService,
     private serverService: ServerService,
     private domSanitizer: DomSanitizer,
-    private redirectService: RedirectService
+    private redirectService: RedirectService,
+    private screenService: ScreenService
   ) { }
 
   get serverVersion () {
@@ -55,7 +56,7 @@ export class AppComponent implements OnInit {
       if (e instanceof NavigationEnd) {
         const pathname = window.location.pathname
         if (!pathname || pathname === '/' || is18nPath(pathname)) {
-          this.redirectService.redirectToHomepage()
+          this.redirectService.redirectToHomepage(true)
         }
       }
     })
@@ -75,14 +76,14 @@ export class AppComponent implements OnInit {
     this.serverService.loadVideoPrivacies()
 
     // Do not display menu on small screens
-    if (isInSmallView()) {
+    if (this.screenService.isInSmallView()) {
       this.isMenuDisplayed = false
     }
 
     this.router.events.subscribe(
       e => {
         // User clicked on a link in the menu, change the page
-        if (e instanceof GuardsCheckStart && isInSmallView()) {
+        if (e instanceof GuardsCheckStart && this.screenService.isInSmallView()) {
           this.isMenuDisplayed = false
         }
       }
@@ -114,7 +115,6 @@ export class AppComponent implements OnInit {
   }
 
   toggleMenu () {
-    window.scrollTo(0, 0)
     this.isMenuDisplayed = !this.isMenuDisplayed
   }
 }