aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/videos/+video-watch
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-06-11 16:26:48 +0200
committerChocobozzz <me@florianbigard.com>2019-06-11 16:26:48 +0200
commit011e1e6b37e15a44624b2d0e50263e16382060d2 (patch)
tree15d75ab2380f093e560458efe26291fc6b05b038 /client/src/app/videos/+video-watch
parent675a8fc74faefa0161b0754bd61c710de7a449c5 (diff)
downloadPeerTube-011e1e6b37e15a44624b2d0e50263e16382060d2.tar.gz
PeerTube-011e1e6b37e15a44624b2d0e50263e16382060d2.tar.zst
PeerTube-011e1e6b37e15a44624b2d0e50263e16382060d2.zip
Speedup video watch layout build
Diffstat (limited to 'client/src/app/videos/+video-watch')
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss1
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts4
2 files changed, 4 insertions, 1 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index bada9bae8..35ea0fffd 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -347,6 +347,7 @@ $player-factor: 1.7; // 16/9
347 /deep/ .other-videos { 347 /deep/ .other-videos {
348 padding-left: 15px; 348 padding-left: 15px;
349 flex-basis: $other-videos-width; 349 flex-basis: $other-videos-width;
350 min-width: $other-videos-width;
350 351
351 .title-page { 352 .title-page {
352 margin-top: 0 !important; 353 margin-top: 0 !important;
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index cf9dc8f9c..29c472a42 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -31,6 +31,7 @@ import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.
31import { Video } from '@app/shared/video/video.model' 31import { Video } from '@app/shared/video/video.model'
32import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils' 32import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
33import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component' 33import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component'
34import { getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
34 35
35@Component({ 36@Component({
36 selector: 'my-video-watch', 37 selector: 'my-video-watch',
@@ -121,6 +122,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
121 }) 122 })
122 123
123 this.initHotkeys() 124 this.initHotkeys()
125
126 this.theaterEnabled = getStoredTheater()
124 } 127 }
125 128
126 ngOnDestroy () { 129 ngOnDestroy () {
@@ -445,7 +448,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
445 448
446 this.zone.runOutsideAngular(async () => { 449 this.zone.runOutsideAngular(async () => {
447 this.player = await PeertubePlayerManager.initialize(mode, options) 450 this.player = await PeertubePlayerManager.initialize(mode, options)
448 this.theaterEnabled = this.player.theaterEnabled
449 451
450 this.player.on('customError', ({ err }: { err: any }) => this.handleError(err)) 452 this.player.on('customError', ({ err }: { err: any }) => this.handleError(err))
451 453