X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=d2678096f7887b6bed4e0c621095f39ba4f4354c;hb=6693df9dd60e6966186bcb7765218596de7b65c0;hp=b1818c298eb0545b31ec433bde20c9a60516e190;hpb=fada8d75550dc7365f7e18ee1569b9406251d660;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index b1818c298..d2678096f 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
-import { AuthService, ServerService } from './core'
+import { NavigationEnd, Router } from '@angular/router'
+import { AuthService, ServerService } from '@app/core'
+import { isInMobileView } from '@app/shared/misc/utils'
 
 @Component({
   selector: 'my-app',
@@ -29,6 +30,10 @@ export class AppComponent implements OnInit {
     private serverService: ServerService
   ) {}
 
+  get serverVersion () {
+    return this.serverService.getConfig().serverVersion
+  }
+
   ngOnInit () {
     this.authService.loadClientCredentials()
 
@@ -45,13 +50,18 @@ export class AppComponent implements OnInit {
     this.serverService.loadVideoPrivacies()
 
     // Do not display menu on small screens
-    if (window.innerWidth < 600) {
+    if (isInMobileView()) {
       this.isMenuDisplayed = false
     }
-  }
 
-  isInAdmin () {
-    return this.router.url.indexOf('/admin/') !== -1
+    this.router.events.subscribe(
+      e => {
+        // User clicked on a link in the menu, change the page
+        if (e instanceof NavigationEnd && isInMobileView()) {
+          this.isMenuDisplayed = false
+        }
+      }
+    )
   }
 
   toggleMenu () {