X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.ts;h=8fa1de3264baeeabbf26c89a4b5b50a8feb9db20;hb=746018f6b81b40e8858303662ac9ec5ce59ac6eb;hp=97a3b6d24ea3081781a9f880c4b1c082d79b4035;hpb=f3081d6401b63da41b03376f9f952bf1cca8303d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index 97a3b6d24..8fa1de326 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -1,13 +1,15 @@
-import { ViewportScroller } from '@angular/common'
 import { HotkeysService } from 'angular2-hotkeys'
 import * as debug from 'debug'
 import { switchMap } from 'rxjs/operators'
+import { ViewportScroller } from '@angular/common'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { Router } from '@angular/router'
-import { scrollToTop } from '@app/helpers'
 import { AuthService, AuthStatus, AuthUser, MenuService, RedirectService, ScreenService, ServerService, UserService } from '@app/core'
+import { scrollToTop } from '@app/helpers'
 import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
 import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
+import { PeertubeModalService } from '@app/shared/shared-main/peertube-modal/peertube-modal.service'
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 import { ServerConfig, UserRight, VideoConstant } from '@shared/models'
 
 const logger = debug('peertube:menu:MenuComponent')
@@ -20,6 +22,7 @@ const logger = debug('peertube:menu:MenuComponent')
 export class MenuComponent implements OnInit {
   @ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent
   @ViewChild('quickSettingsModal', { static: true }) quickSettingsModal: QuickSettingsModalComponent
+  @ViewChild('dropdown') dropdown: NgbDropdown
 
   user: AuthUser
   isLoggedIn: boolean
@@ -28,6 +31,9 @@ export class MenuComponent implements OnInit {
   helpVisible = false
 
   videoLanguages: string[] = []
+  nsfwPolicy: string
+
+  currentInterfaceLanguage: string
 
   private languages: VideoConstant<string>[] = []
   private serverConfig: ServerConfig
@@ -49,6 +55,7 @@ export class MenuComponent implements OnInit {
     private hotkeysService: HotkeysService,
     private screenService: ScreenService,
     private menuService: MenuService,
+    private modalService: PeertubeModalService,
     private router: Router
   ) { }
 
@@ -56,33 +63,16 @@ export class MenuComponent implements OnInit {
     return this.screenService.isInMobileView()
   }
 
-  get placement () {
-    if (this.isInMobileView) {
-      return 'left-top auto'
-    } else {
-      return 'right-top auto'
-    }
+  get dropdownContainer () {
+    if (this.isInMobileView) return null
+
+    return 'body' as 'body'
   }
 
   get language () {
     return this.languageChooserModal.getCurrentLanguage()
   }
 
-  get nsfwPolicy () {
-    if (!this.user) return
-
-    switch (this.user.nsfwPolicy) {
-      case 'do_not_list':
-        return $localize`hide`
-
-      case 'blur':
-        return $localize`blur`
-
-      case 'display':
-        return $localize`display`
-    }
-  }
-
   get instanceName () {
     return this.serverConfig.instance.name
   }
@@ -95,11 +85,15 @@ export class MenuComponent implements OnInit {
     this.isLoggedIn = this.authService.isLoggedIn()
     if (this.isLoggedIn === true) {
       this.user = this.authService.getUser()
+
+      this.computeNSFWPolicy()
       this.computeVideosLink()
     }
 
     this.computeAdminAccess()
 
+    this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage()
+
     this.authService.loginChangedSource.subscribe(
       status => {
         if (status === AuthStatus.LoggedIn) {
@@ -133,6 +127,9 @@ export class MenuComponent implements OnInit {
         this.authService.userInformationLoaded
           .subscribe(() => this.buildUserLanguages())
       })
+
+    this.modalService.openQuickSettingsSubject
+      .subscribe(() => this.openQuickSettings())
   }
 
   isRegistrationAllowed () {
@@ -221,6 +218,29 @@ export class MenuComponent implements OnInit {
     }
   }
 
+  // Lock menu scroll when menu scroll to avoid fleeing / detached dropdown
+  onMenuScrollEvent () {
+    document.querySelector('menu').scrollTo(0, 0)
+  }
+
+  onDropdownOpenChange (opened: boolean) {
+    if (this.screenService.isInMobileView()) return
+
+    // Close dropdown when window scroll to avoid dropdown quick jump for re-position
+    const onWindowScroll = () => {
+      this.dropdown?.close()
+      window.removeEventListener('scroll', onWindowScroll)
+    }
+
+    if (opened) {
+      window.addEventListener('scroll', onWindowScroll)
+      document.querySelector('menu').scrollTo(0, 0) // Reset menu scroll to easy lock
+      document.querySelector('menu').addEventListener('scroll', this.onMenuScrollEvent)
+    } else {
+      document.querySelector('menu').removeEventListener('scroll', this.onMenuScrollEvent)
+    }
+  }
+
   private buildUserLanguages () {
     if (!this.user) {
       this.videoLanguages = []
@@ -252,4 +272,25 @@ export class MenuComponent implements OnInit {
         else logger('User cannot see videos link.')
       })
   }
+
+  private computeNSFWPolicy () {
+    if (!this.user) {
+      this.nsfwPolicy = null
+      return
+    }
+
+    switch (this.user.nsfwPolicy) {
+      case 'do_not_list':
+        this.nsfwPolicy = $localize`hide`
+        break
+
+      case 'blur':
+        this.nsfwPolicy = $localize`blur`
+        break
+
+      case 'display':
+        this.nsfwPolicy = $localize`display`
+        break
+    }
+  }
 }