ActivityPub-federated video streaming platform using P2P directly in your web browser
Faster menu collapsed detection
Chocobozzzaa89718329fc
diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.tsindex db3de27009..5703fef0f4 100644--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts@@ -3,7 +3,8 @@ import { HttpErrorResponse } from '@angular/common/http'import { booleanAttribute, Component, inject, input, OnDestroy, OnInit, output } from '@angular/core'import { FormsModule, ReactiveFormsModule } from '@angular/forms'import { RouterModule } from '@angular/router'-import { MenuService, Notifier, ScreenService } from '@app/core'+import { Notifier, ScreenService } from '@app/core'+import { HeaderService } from '@app/header/header.service'import { Video } from '@app/shared/shared-main/video/video.model'import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'@@ -12,7 +13,6 @@ import { UploadProgressComponent } from '../../shared/standalone-upload/upload-pimport { ManageErrorsComponent } from './common/manage-errors.component'import { VideoEdit } from './common/video-edit.model'import { VideoManageController } from './video-manage-controller.service'-import { HeaderService } from '@app/header/header.service'@Component({selector: 'my-video-manage-container',@@ -33,7 +33,6 @@ import { HeaderService } from '@app/header/header.service'export class VideoManageContainerComponent implements OnInit, OnDestroy {private manageController = inject(VideoManageController)private notifier = inject(Notifier)- private menuService = inject(MenuService)private headerService = inject(HeaderService)private screenService = inject(ScreenService)@@ -50,12 +49,8 @@ export class VideoManageContainerComponent implements OnInit, OnDestroy {private isUpdating = falseprivate videoEdit: VideoEdit- private menuWasCollapsed: booleanngOnInit (): void {- this.menuWasCollapsed = this.menuService.isCollapsed()- this.menuService.setMenuCollapsed(true)-if (this.screenService.isInMobileView()) {this.headerService.setSearchHidden(true)}@@ -65,7 +60,6 @@ export class VideoManageContainerComponent implements OnInit, OnDestroy {}ngOnDestroy (): void {- this.menuService.setMenuCollapsed(this.menuWasCollapsed)this.headerService.setSearchHidden(false)}diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.tsindex 1b0121a4ef..fec7a24c3f 100644--- a/client/src/app/core/menu/menu.service.ts+++ b/client/src/app/core/menu/menu.service.ts@@ -1,21 +1,28 @@import { Injectable, inject } from '@angular/core'+import debug from 'debug'import { fromEvent } from 'rxjs'import { debounceTime } from 'rxjs/operators'+import { PeerTubeRouterService } from '../routing'import { LocalStorageService, ScreenService } from '../wrappers'+const debugLogger = debug('peertube:menu')+@Injectable()export class MenuService {private screenService = inject(ScreenService)private localStorageService = inject(LocalStorageService)+ private peertubeRouterService = inject(PeerTubeRouterService)private static LS_MENU_COLLAPSED = 'menu-collapsed'private menuCollapsed = falseprivate menuChangedByUser = false+ private collapsedBeforeUrl: boolean+constructor () {- // Do not display menu on small or touch screens- if (this.screenService.isInSmallView() || this.screenService.isInTouchScreen()) {+ // Do not display menu on small screens+ if (this.screenService.isInMenuOverlayView() || this.hasMenuCollapsedByUrl(window.location.pathname)) {this.setMenuCollapsed(true)} else {this.setMenuCollapsed(this.localStorageService.getItem(MenuService.LS_MENU_COLLAPSED) === 'true')@@ -23,6 +30,41 @@ export class MenuService {}this.handleWindowResize()++ this.peertubeRouterService.getNavigationEndEvents()+ .subscribe(e => {+ if (this.hasMenuCollapsedByUrl(e.url)) {+ this.collapseByUrl()+ return+ }++ if (this.collapsedBeforeUrl !== undefined) {+ this.setMenuCollapsed(this.collapsedBeforeUrl)+ this.collapsedBeforeUrl = undefined+ }+ })+ }++ private hasMenuCollapsedByUrl (url: string) {+ console.log(url)+ const collapsedBaseUrls = [ '/videos/publish', '/videos/manage/' ]++ for (const collapsedBaseUrl of collapsedBaseUrls) {+ if (url.startsWith(collapsedBaseUrl)) {+ debugLogger('Menu should be collapsed by URL ' + url)++ return true+ }+ }++ return false+ }++ private collapseByUrl () {+ if (this.menuCollapsed) return++ this.collapsedBeforeUrl = this.menuCollapsed+ this.setMenuCollapsed(true)}toggleMenu () {diff --git a/client/src/app/core/wrappers/screen.service.ts b/client/src/app/core/wrappers/screen.service.tsindex 3026825ded..1facbf4b52 100644--- a/client/src/app/core/wrappers/screen.service.ts+++ b/client/src/app/core/wrappers/screen.service.ts@@ -13,17 +13,20 @@ export class ScreenService {}isInSmallView () {+ // Keep it sync with SASS variablereturn this.getWindowInnerWidth() < 800}- isInMediumView () {- return this.getWindowInnerWidth() < 1100- }-isInMobileView () {+ // Keep it sync with SASS variablereturn this.getWindowInnerWidth() < 500}+ isInMenuOverlayView () {+ // Keep it sync with $menu-overlay-view SASS variable+ return this.getWindowInnerWidth() < 1200+ }+isInTouchScreen () {return !!('ontouchstart' in window || (navigator as any).msMaxTouchPoints)}