ActivityPub-federated video streaming platform using P2P directly in your web browser
Do not undo collapse
Chocobozzzb33bd77b5140
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.tsindex 1bf870e6ba..ce2b476749 100644--- a/client/src/app/core/menu/menu.service.ts+++ b/client/src/app/core/menu/menu.service.ts@@ -18,8 +18,6 @@ export class MenuService {private menuCollapsed = falseprivate menuChangedByUser = false- private collapsedBeforeUrl: boolean-constructor () {// Do not display menu on small screensif (this.screenService.isInMenuOverlayView() || this.hasMenuCollapsedByUrl(window.location.pathname)) {@@ -37,11 +35,6 @@ export class MenuService {this.collapseByUrl()return}-- if (this.collapsedBeforeUrl !== undefined) {- this.setMenuCollapsed(this.collapsedBeforeUrl)- this.collapsedBeforeUrl = undefined- }})}@@ -68,7 +61,6 @@ export class MenuService {private collapseByUrl () {if (this.menuCollapsed) return- this.collapsedBeforeUrl = this.menuCollapsedthis.setMenuCollapsed(true)}diff --git a/packages/tests/src/plugins/plugin-transcoding.ts b/packages/tests/src/plugins/plugin-transcoding.tsindex da1068ea09..a6b4d14d8b 100644--- a/packages/tests/src/plugins/plugin-transcoding.ts+++ b/packages/tests/src/plugins/plugin-transcoding.ts@@ -9,6 +9,7 @@ import {PluginsCommand,setAccessTokensToServers,setDefaultVideoChannel,+ stopFfmpeg,testFfmpegStreamError,waitJobs} from '@peertube/peertube-server-commands'@@ -272,7 +273,7 @@ describe('Test transcoding plugins', function () {const liveVideoId = await createLiveWrapper(server)- await server.live.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })+ const ffmpegCommand = await server.live.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })await server.live.waitUntilPublished({ videoId: liveVideoId })await waitJobs([ server ])@@ -287,6 +288,9 @@ describe('Test transcoding plugins', function () {expect(videoProbe.codec_name).to.equal('h264')}}++ await stopFfmpeg(ffmpegCommand)+ await server.live.waitUntilPublished({ videoId: liveVideoId })})})