diff options
Diffstat (limited to 'client/src/assets/player/peertube-player-manager.ts')
-rw-r--r-- | client/src/assets/player/peertube-player-manager.ts | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index c45e8f53e..f3c21fc4c 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts | |||
@@ -435,8 +435,6 @@ export class PeertubePlayerManager { | |||
435 | const p2pMediaLoaderOptions = options.p2pMediaLoader | 435 | const p2pMediaLoaderOptions = options.p2pMediaLoader |
436 | 436 | ||
437 | const autoplay = this.getAutoPlayValue(commonOptions.autoplay) === 'play' | 437 | const autoplay = this.getAutoPlayValue(commonOptions.autoplay) === 'play' |
438 | ? true | ||
439 | : false | ||
440 | 438 | ||
441 | const webtorrent = { | 439 | const webtorrent = { |
442 | autoplay, | 440 | autoplay, |
@@ -459,10 +457,10 @@ export class PeertubePlayerManager { | |||
459 | theaterButton: boolean | 457 | theaterButton: boolean |
460 | captions: boolean | 458 | captions: boolean |
461 | 459 | ||
462 | nextVideo?: Function | 460 | nextVideo?: () => void |
463 | hasNextVideo?: () => boolean | 461 | hasNextVideo?: () => boolean |
464 | 462 | ||
465 | previousVideo?: Function | 463 | previousVideo?: () => void |
466 | hasPreviousVideo?: () => boolean | 464 | hasPreviousVideo?: () => boolean |
467 | }) { | 465 | }) { |
468 | const settingEntries = [] | 466 | const settingEntries = [] |
@@ -487,7 +485,7 @@ export class PeertubePlayerManager { | |||
487 | } | 485 | } |
488 | 486 | ||
489 | Object.assign(children, { | 487 | Object.assign(children, { |
490 | 'previousVideoButton': buttonOptions | 488 | previousVideoButton: buttonOptions |
491 | }) | 489 | }) |
492 | } | 490 | } |
493 | 491 | ||
@@ -505,35 +503,35 @@ export class PeertubePlayerManager { | |||
505 | } | 503 | } |
506 | 504 | ||
507 | Object.assign(children, { | 505 | Object.assign(children, { |
508 | 'nextVideoButton': buttonOptions | 506 | nextVideoButton: buttonOptions |
509 | }) | 507 | }) |
510 | } | 508 | } |
511 | 509 | ||
512 | Object.assign(children, { | 510 | Object.assign(children, { |
513 | 'currentTimeDisplay': {}, | 511 | currentTimeDisplay: {}, |
514 | 'timeDivider': {}, | 512 | timeDivider: {}, |
515 | 'durationDisplay': {}, | 513 | durationDisplay: {}, |
516 | 'liveDisplay': {}, | 514 | liveDisplay: {}, |
517 | 515 | ||
518 | 'flexibleWidthSpacer': {}, | 516 | flexibleWidthSpacer: {}, |
519 | 'progressControl': { | 517 | progressControl: { |
520 | children: { | 518 | children: { |
521 | 'seekBar': { | 519 | seekBar: { |
522 | children: { | 520 | children: { |
523 | [loadProgressBar]: {}, | 521 | [loadProgressBar]: {}, |
524 | 'mouseTimeDisplay': {}, | 522 | mouseTimeDisplay: {}, |
525 | 'playProgressBar': {} | 523 | playProgressBar: {} |
526 | } | 524 | } |
527 | } | 525 | } |
528 | } | 526 | } |
529 | }, | 527 | }, |
530 | 528 | ||
531 | 'p2PInfoButton': {}, | 529 | p2PInfoButton: {}, |
532 | 530 | ||
533 | 'muteToggle': {}, | 531 | muteToggle: {}, |
534 | 'volumeControl': {}, | 532 | volumeControl: {}, |
535 | 533 | ||
536 | 'settingsButton': { | 534 | settingsButton: { |
537 | setup: { | 535 | setup: { |
538 | maxHeightOffset: 40 | 536 | maxHeightOffset: 40 |
539 | }, | 537 | }, |
@@ -543,18 +541,18 @@ export class PeertubePlayerManager { | |||
543 | 541 | ||
544 | if (options.peertubeLink === true) { | 542 | if (options.peertubeLink === true) { |
545 | Object.assign(children, { | 543 | Object.assign(children, { |
546 | 'peerTubeLinkButton': { shortUUID: options.videoShortUUID } as PeerTubeLinkButtonOptions | 544 | peerTubeLinkButton: { shortUUID: options.videoShortUUID } as PeerTubeLinkButtonOptions |
547 | }) | 545 | }) |
548 | } | 546 | } |
549 | 547 | ||
550 | if (options.theaterButton === true) { | 548 | if (options.theaterButton === true) { |
551 | Object.assign(children, { | 549 | Object.assign(children, { |
552 | 'theaterButton': {} | 550 | theaterButton: {} |
553 | }) | 551 | }) |
554 | } | 552 | } |
555 | 553 | ||
556 | Object.assign(children, { | 554 | Object.assign(children, { |
557 | 'fullscreenToggle': {} | 555 | fullscreenToggle: {} |
558 | }) | 556 | }) |
559 | 557 | ||
560 | return children | 558 | return children |