From 7e37e111116e41530749b88327bc601cb39ade03 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Apr 2020 11:20:12 +0200 Subject: Fix videojs typings --- client/src/assets/player/videojs-components/next-video-button.ts | 4 ++-- client/src/assets/player/videojs-components/p2p-info-button.ts | 2 +- client/src/assets/player/videojs-components/peertube-link-button.ts | 4 ++-- .../assets/player/videojs-components/peertube-load-progress-bar.ts | 4 ++-- client/src/assets/player/videojs-components/resolution-menu-button.ts | 4 ++-- client/src/assets/player/videojs-components/resolution-menu-item.ts | 4 ++-- client/src/assets/player/videojs-components/settings-dialog.ts | 4 ++-- client/src/assets/player/videojs-components/settings-menu-button.ts | 4 ++-- client/src/assets/player/videojs-components/settings-menu-item.ts | 4 ++-- client/src/assets/player/videojs-components/settings-panel-child.ts | 4 ++-- client/src/assets/player/videojs-components/settings-panel.ts | 4 ++-- client/src/assets/player/videojs-components/theater-button.ts | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) (limited to 'client/src/assets/player/videojs-components') diff --git a/client/src/assets/player/videojs-components/next-video-button.ts b/client/src/assets/player/videojs-components/next-video-button.ts index bdb245dcc..c97ecdda6 100644 --- a/client/src/assets/player/videojs-components/next-video-button.ts +++ b/client/src/assets/player/videojs-components/next-video-button.ts @@ -1,4 +1,4 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' const Button = videojs.getComponent('Button') @@ -9,7 +9,7 @@ export interface NextVideoButtonOptions extends videojs.ComponentOptions { class NextVideoButton extends Button { private readonly nextVideoButtonOptions: NextVideoButtonOptions - constructor (player: VideoJsPlayer, options?: NextVideoButtonOptions) { + constructor (player: videojs.Player, options?: NextVideoButtonOptions) { super(player, options) this.nextVideoButtonOptions = options diff --git a/client/src/assets/player/videojs-components/p2p-info-button.ts b/client/src/assets/player/videojs-components/p2p-info-button.ts index db6806fed..e340337ed 100644 --- a/client/src/assets/player/videojs-components/p2p-info-button.ts +++ b/client/src/assets/player/videojs-components/p2p-info-button.ts @@ -1,5 +1,5 @@ import { PlayerNetworkInfo } from '../peertube-videojs-typings' -import videojs from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' import { bytes } from '../utils' const Button = videojs.getComponent('Button') diff --git a/client/src/assets/player/videojs-components/peertube-link-button.ts b/client/src/assets/player/videojs-components/peertube-link-button.ts index 0db9762a5..4151758d4 100644 --- a/client/src/assets/player/videojs-components/peertube-link-button.ts +++ b/client/src/assets/player/videojs-components/peertube-link-button.ts @@ -1,10 +1,10 @@ import { buildVideoLink } from '../utils' -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' const Button = videojs.getComponent('Button') class PeerTubeLinkButton extends Button { - constructor (player: VideoJsPlayer, options?: videojs.ComponentOptions) { + constructor (player: videojs.Player, options?: videojs.ComponentOptions) { super(player, options) } diff --git a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts index 8168e8f2d..395720c53 100644 --- a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts +++ b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts @@ -1,10 +1,10 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' const Component = videojs.getComponent('Component') class PeerTubeLoadProgressBar extends Component { - constructor (player: VideoJsPlayer, options?: videojs.ComponentOptions) { + constructor (player: videojs.Player, options?: videojs.ComponentOptions) { super(player, options) this.on(player, 'progress', this.update) diff --git a/client/src/assets/player/videojs-components/resolution-menu-button.ts b/client/src/assets/player/videojs-components/resolution-menu-button.ts index 0fa6272e7..d49ca0230 100644 --- a/client/src/assets/player/videojs-components/resolution-menu-button.ts +++ b/client/src/assets/player/videojs-components/resolution-menu-button.ts @@ -1,4 +1,4 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' import { LoadedQualityData } from '../peertube-videojs-typings' import { ResolutionMenuItem } from './resolution-menu-item' @@ -8,7 +8,7 @@ const MenuButton = videojs.getComponent('MenuButton') class ResolutionMenuButton extends MenuButton { labelEl_: HTMLElement - constructor (player: VideoJsPlayer, options?: videojs.MenuButtonOptions) { + constructor (player: videojs.Player, options?: videojs.MenuButtonOptions) { super(player, options) this.controlText('Quality') diff --git a/client/src/assets/player/videojs-components/resolution-menu-item.ts b/client/src/assets/player/videojs-components/resolution-menu-item.ts index b039c4572..cb0d219ad 100644 --- a/client/src/assets/player/videojs-components/resolution-menu-item.ts +++ b/client/src/assets/player/videojs-components/resolution-menu-item.ts @@ -1,4 +1,4 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' import { AutoResolutionUpdateData, ResolutionUpdateData } from '../peertube-videojs-typings' const MenuItem = videojs.getComponent('MenuItem') @@ -19,7 +19,7 @@ class ResolutionMenuItem extends MenuItem { private autoResolutionPossible: boolean private currentResolutionLabel: string - constructor (player: VideoJsPlayer, options?: ResolutionMenuItemOptions) { + constructor (player: videojs.Player, options?: ResolutionMenuItemOptions) { options.selectable = true super(player, options) diff --git a/client/src/assets/player/videojs-components/settings-dialog.ts b/client/src/assets/player/videojs-components/settings-dialog.ts index dd0b1e472..8fd5ad96c 100644 --- a/client/src/assets/player/videojs-components/settings-dialog.ts +++ b/client/src/assets/player/videojs-components/settings-dialog.ts @@ -1,9 +1,9 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' const Component = videojs.getComponent('Component') class SettingsDialog extends Component { - constructor (player: VideoJsPlayer) { + constructor (player: videojs.Player) { super(player) this.hide() diff --git a/client/src/assets/player/videojs-components/settings-menu-button.ts b/client/src/assets/player/videojs-components/settings-menu-button.ts index eae628e7d..749128bdc 100644 --- a/client/src/assets/player/videojs-components/settings-menu-button.ts +++ b/client/src/assets/player/videojs-components/settings-menu-button.ts @@ -1,7 +1,7 @@ // Thanks to Yanko Shterev: https://github.com/yshterev/videojs-settings-menu import { SettingsMenuItem } from './settings-menu-item' import { toTitleCase } from '../utils' -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' import { SettingsDialog } from './settings-dialog' import { SettingsPanel } from './settings-panel' @@ -32,7 +32,7 @@ class SettingsButton extends Button { private settingsButtonOptions: SettingsButtonOptions - constructor (player: VideoJsPlayer, options?: SettingsButtonOptions) { + constructor (player: videojs.Player, options?: SettingsButtonOptions) { super(player, options) this.settingsButtonOptions = options diff --git a/client/src/assets/player/videojs-components/settings-menu-item.ts b/client/src/assets/player/videojs-components/settings-menu-item.ts index f5671f49d..8d364591b 100644 --- a/client/src/assets/player/videojs-components/settings-menu-item.ts +++ b/client/src/assets/player/videojs-components/settings-menu-item.ts @@ -1,6 +1,6 @@ // Thanks to Yanko Shterev: https://github.com/yshterev/videojs-settings-menu import { toTitleCase } from '../utils' -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' import { SettingsButton } from './settings-menu-button' import { SettingsDialog } from './settings-dialog' import { SettingsPanel } from './settings-panel' @@ -32,7 +32,7 @@ class SettingsMenuItem extends MenuItem { settingsSubMenuValueEl_: HTMLElement settingsSubMenuEl_: HTMLElement - constructor (player: VideoJsPlayer, options?: SettingsMenuItemOptions) { + constructor (player: videojs.Player, options?: SettingsMenuItemOptions) { super(player, options) this.settingsButton = options.menuButton diff --git a/client/src/assets/player/videojs-components/settings-panel-child.ts b/client/src/assets/player/videojs-components/settings-panel-child.ts index d12e8218a..6dee6d7df 100644 --- a/client/src/assets/player/videojs-components/settings-panel-child.ts +++ b/client/src/assets/player/videojs-components/settings-panel-child.ts @@ -1,10 +1,10 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' const Component = videojs.getComponent('Component') class SettingsPanelChild extends Component { - constructor (player: VideoJsPlayer, options?: videojs.ComponentOptions) { + constructor (player: videojs.Player, options?: videojs.ComponentOptions) { super(player, options) } diff --git a/client/src/assets/player/videojs-components/settings-panel.ts b/client/src/assets/player/videojs-components/settings-panel.ts index 2090abf45..833ee2f21 100644 --- a/client/src/assets/player/videojs-components/settings-panel.ts +++ b/client/src/assets/player/videojs-components/settings-panel.ts @@ -1,10 +1,10 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' const Component = videojs.getComponent('Component') class SettingsPanel extends Component { - constructor (player: VideoJsPlayer, options?: videojs.ComponentOptions) { + constructor (player: videojs.Player, options?: videojs.ComponentOptions) { super(player, options) } diff --git a/client/src/assets/player/videojs-components/theater-button.ts b/client/src/assets/player/videojs-components/theater-button.ts index 1c8c9f154..41875af71 100644 --- a/client/src/assets/player/videojs-components/theater-button.ts +++ b/client/src/assets/player/videojs-components/theater-button.ts @@ -1,4 +1,4 @@ -import videojs, { VideoJsPlayer } from 'video.js' +import videojs from 'video.js/dist/alt/video.core.js' import { saveTheaterInStore, getStoredTheater } from '../peertube-player-local-storage' const Button = videojs.getComponent('Button') @@ -6,7 +6,7 @@ class TheaterButton extends Button { private static readonly THEATER_MODE_CLASS = 'vjs-theater-enabled' - constructor (player: VideoJsPlayer, options: videojs.ComponentOptions) { + constructor (player: videojs.Player, options: videojs.ComponentOptions) { super(player, options) const enabled = getStoredTheater() -- cgit v1.2.3