X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fassets%2Fplayer%2Fpeertube-videojs-plugin.ts;h=a96f6d1a1062dad341be2349cf92c310d0e5c1d3;hb=ff7589ba1b27e6ef31452bf485f1f193f5c4c28e;hp=618d77cbed6c373a8e0b1ae61c04fb053c456f8a;hpb=bf5685f0b7b1f23a1a3a972fc4d66061f31f9510;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index 618d77cbe..a96f6d1a1 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -22,7 +22,6 @@ interface VideoJSComponentInterface { type PeertubePluginOptions = { videoFiles: VideoFile[] playerElement: HTMLVideoElement - peerTubeLink: boolean videoViewUrl: string videoDuration: number } @@ -112,15 +111,11 @@ class ResolutionMenuButton extends MenuButton { buildCSSClass () { return super.buildCSSClass() + ' vjs-resolution-button' } - - dispose () { - this.parentNode.removeChild(this) - } } MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') -class PeertubeLinkButton extends Button { +class PeerTubeLinkButton extends Button { createEl () { const link = document.createElement('a') @@ -136,12 +131,8 @@ class PeertubeLinkButton extends Button { handleClick () { this.player_.pause() } - - dispose () { - this.parentNode.removeChild(this) - } } -Button.registerComponent('PeerTubeLinkButton', PeertubeLinkButton) +Button.registerComponent('PeerTubeLinkButton', PeerTubeLinkButton) class WebTorrentButton extends Button { createEl () { @@ -227,10 +218,6 @@ class WebTorrentButton extends Button { return div } - - dispose () { - this.parentNode.removeChild(this) - } } Button.registerComponent('WebTorrentButton', WebTorrentButton) @@ -307,7 +294,9 @@ class PeerTubePlugin extends Plugin { // Do not display error to user because we will have multiple fallbacks this.disableErrorDisplay() + this.player.src = () => true + this.player.playbackRate(1) const previousVideoFile = this.currentVideoFile this.currentVideoFile = videoFile @@ -390,20 +379,6 @@ class PeerTubePlugin extends Plugin { } private initializePlayer (options: PeertubePluginOptions) { - const controlBar = this.player.controlBar - - const menuButton = new ResolutionMenuButton(this.player, options) - const fullscreenElement = controlBar.fullscreenToggle.el() - controlBar.resolutionSwitcher = controlBar.el().insertBefore(menuButton.el(), fullscreenElement) - - if (options.peerTubeLink === true) { - const peerTubeLinkButton = new PeertubeLinkButton(this.player) - controlBar.peerTubeLink = controlBar.el().insertBefore(peerTubeLinkButton.el(), fullscreenElement) - } - - const webTorrentButton = new WebTorrentButton(this.player) - controlBar.webTorrent = controlBar.el().insertBefore(webTorrentButton.el(), controlBar.progressControl.el()) - if (this.autoplay === true) { this.updateVideoFile(undefined, () => this.player.play()) } else {