aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-01 19:02:51 +0100
committerChocobozzz <me@florianbigard.com>2018-03-01 19:02:51 +0100
commit3ec8dc096276ac3c7e5d8dca5f100017516f62ec (patch)
treeefeab8056224d54f44dc498a110fba54d831d4f0 /client/src/app
parentc7bfd4532ea5783be525525c8260159497cb0f64 (diff)
downloadPeerTube-3ec8dc096276ac3c7e5d8dca5f100017516f62ec.tar.gz
PeerTube-3ec8dc096276ac3c7e5d8dca5f100017516f62ec.tar.zst
PeerTube-3ec8dc096276ac3c7e5d8dca5f100017516f62ec.zip
Cleaner videojs control bar implementation
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts24
1 files changed, 23 insertions, 1 deletions
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 b1dd3d10b..2924f1622 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -346,13 +346,35 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
346 peertube: { 346 peertube: {
347 videoFiles: this.video.files, 347 videoFiles: this.video.files,
348 playerElement: this.playerElement, 348 playerElement: this.playerElement,
349 peerTubeLink: false,
350 videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid), 349 videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid),
351 videoDuration: this.video.duration 350 videoDuration: this.video.duration
352 }, 351 },
353 hotkeys: { 352 hotkeys: {
354 enableVolumeScroll: false 353 enableVolumeScroll: false
355 } 354 }
355 },
356 controlBar: {
357 children: [
358 'playToggle',
359 'currentTimeDisplay',
360 'timeDivider',
361 'durationDisplay',
362 'liveDisplay',
363
364 'flexibleWidthSpacer',
365 'progressControl',
366
367 'webTorrentButton',
368
369 'playbackRateMenuButton',
370
371 'muteToggle',
372 'volumeControl',
373
374 'resolutionMenuButton',
375
376 'fullscreenToggle'
377 ]
356 } 378 }
357 } 379 }
358 380