diff options
Diffstat (limited to 'client/src/assets/player')
-rw-r--r-- | client/src/assets/player/control-bar/next-previous-video-button.ts (renamed from client/src/assets/player/videojs-components/next-previous-video-button.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/control-bar/p2p-info-button.ts (renamed from client/src/assets/player/videojs-components/p2p-info-button.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/control-bar/peertube-link-button.ts (renamed from client/src/assets/player/videojs-components/peertube-link-button.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/control-bar/peertube-load-progress-bar.ts (renamed from client/src/assets/player/videojs-components/peertube-load-progress-bar.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/control-bar/theater-button.ts (renamed from client/src/assets/player/videojs-components/theater-button.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/peertube-player-manager.ts | 24 | ||||
-rw-r--r-- | client/src/assets/player/peertube-plugin.ts | 4 | ||||
-rw-r--r-- | client/src/assets/player/settings/resolution-menu-button.ts (renamed from client/src/assets/player/videojs-components/resolution-menu-button.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/settings/resolution-menu-item.ts (renamed from client/src/assets/player/videojs-components/resolution-menu-item.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/settings/settings-dialog.ts (renamed from client/src/assets/player/videojs-components/settings-dialog.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/settings/settings-menu-button.ts (renamed from client/src/assets/player/videojs-components/settings-menu-button.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/settings/settings-menu-item.ts (renamed from client/src/assets/player/videojs-components/settings-menu-item.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/settings/settings-panel-child.ts (renamed from client/src/assets/player/videojs-components/settings-panel-child.ts) | 0 | ||||
-rw-r--r-- | client/src/assets/player/settings/settings-panel.ts (renamed from client/src/assets/player/videojs-components/settings-panel.ts) | 0 |
14 files changed, 14 insertions, 14 deletions
diff --git a/client/src/assets/player/videojs-components/next-previous-video-button.ts b/client/src/assets/player/control-bar/next-previous-video-button.ts index fe17ce2ce..fe17ce2ce 100644 --- a/client/src/assets/player/videojs-components/next-previous-video-button.ts +++ b/client/src/assets/player/control-bar/next-previous-video-button.ts | |||
diff --git a/client/src/assets/player/videojs-components/p2p-info-button.ts b/client/src/assets/player/control-bar/p2p-info-button.ts index 081dee1d3..081dee1d3 100644 --- a/client/src/assets/player/videojs-components/p2p-info-button.ts +++ b/client/src/assets/player/control-bar/p2p-info-button.ts | |||
diff --git a/client/src/assets/player/videojs-components/peertube-link-button.ts b/client/src/assets/player/control-bar/peertube-link-button.ts index c49cee566..c49cee566 100644 --- a/client/src/assets/player/videojs-components/peertube-link-button.ts +++ b/client/src/assets/player/control-bar/peertube-link-button.ts | |||
diff --git a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts b/client/src/assets/player/control-bar/peertube-load-progress-bar.ts index 623e70eb2..623e70eb2 100644 --- a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts +++ b/client/src/assets/player/control-bar/peertube-load-progress-bar.ts | |||
diff --git a/client/src/assets/player/videojs-components/theater-button.ts b/client/src/assets/player/control-bar/theater-button.ts index f862ee224..f862ee224 100644 --- a/client/src/assets/player/videojs-components/theater-button.ts +++ b/client/src/assets/player/control-bar/theater-button.ts | |||
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index 9d2b29811..81ddb8814 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts | |||
@@ -6,18 +6,18 @@ import './stats/stats-plugin' | |||
6 | import './bezels/bezels-plugin' | 6 | import './bezels/bezels-plugin' |
7 | import './peertube-plugin' | 7 | import './peertube-plugin' |
8 | import './peertube-resolutions-plugin' | 8 | import './peertube-resolutions-plugin' |
9 | import './videojs-components/next-previous-video-button' | 9 | import './control-bar/next-previous-video-button' |
10 | import './videojs-components/p2p-info-button' | 10 | import './control-bar/p2p-info-button' |
11 | import './videojs-components/peertube-link-button' | 11 | import './control-bar/peertube-link-button' |
12 | import './videojs-components/peertube-load-progress-bar' | 12 | import './control-bar/peertube-load-progress-bar' |
13 | import './videojs-components/resolution-menu-button' | 13 | import './control-bar/resolution-menu-button' |
14 | import './videojs-components/resolution-menu-item' | 14 | import './control-bar/resolution-menu-item' |
15 | import './videojs-components/settings-dialog' | 15 | import './control-bar/settings-dialog' |
16 | import './videojs-components/settings-menu-button' | 16 | import './control-bar/settings-menu-button' |
17 | import './videojs-components/settings-menu-item' | 17 | import './control-bar/settings-menu-item' |
18 | import './videojs-components/settings-panel' | 18 | import './control-bar/settings-panel' |
19 | import './videojs-components/settings-panel-child' | 19 | import './control-bar/settings-panel-child' |
20 | import './videojs-components/theater-button' | 20 | import './control-bar/theater-button' |
21 | import './playlist/playlist-plugin' | 21 | import './playlist/playlist-plugin' |
22 | import './mobile/peertube-mobile-plugin' | 22 | import './mobile/peertube-mobile-plugin' |
23 | import './mobile/peertube-mobile-buttons' | 23 | import './mobile/peertube-mobile-buttons' |
diff --git a/client/src/assets/player/peertube-plugin.ts b/client/src/assets/player/peertube-plugin.ts index b5c42d1c5..4ffc9ce3e 100644 --- a/client/src/assets/player/peertube-plugin.ts +++ b/client/src/assets/player/peertube-plugin.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import debug from 'debug' | ||
1 | import videojs from 'video.js' | 2 | import videojs from 'video.js' |
2 | import { timeToInt } from '@shared/core-utils' | 3 | import { timeToInt } from '@shared/core-utils' |
3 | import { | 4 | import { |
@@ -10,9 +11,8 @@ import { | |||
10 | saveVolumeInStore | 11 | saveVolumeInStore |
11 | } from './peertube-player-local-storage' | 12 | } from './peertube-player-local-storage' |
12 | import { PeerTubePluginOptions, UserWatching, VideoJSCaption } from './peertube-videojs-typings' | 13 | import { PeerTubePluginOptions, UserWatching, VideoJSCaption } from './peertube-videojs-typings' |
14 | import { SettingsButton } from './settings/settings-menu-button' | ||
13 | import { isMobile } from './utils' | 15 | import { isMobile } from './utils' |
14 | import { SettingsButton } from './videojs-components/settings-menu-button' | ||
15 | import debug from 'debug' | ||
16 | 16 | ||
17 | const logger = debug('peertube:player:peertube') | 17 | const logger = debug('peertube:player:peertube') |
18 | 18 | ||
diff --git a/client/src/assets/player/videojs-components/resolution-menu-button.ts b/client/src/assets/player/settings/resolution-menu-button.ts index 8bd5b4f03..8bd5b4f03 100644 --- a/client/src/assets/player/videojs-components/resolution-menu-button.ts +++ b/client/src/assets/player/settings/resolution-menu-button.ts | |||
diff --git a/client/src/assets/player/videojs-components/resolution-menu-item.ts b/client/src/assets/player/settings/resolution-menu-item.ts index 6047f52f7..6047f52f7 100644 --- a/client/src/assets/player/videojs-components/resolution-menu-item.ts +++ b/client/src/assets/player/settings/resolution-menu-item.ts | |||
diff --git a/client/src/assets/player/videojs-components/settings-dialog.ts b/client/src/assets/player/settings/settings-dialog.ts index 8cd98967f..8cd98967f 100644 --- a/client/src/assets/player/videojs-components/settings-dialog.ts +++ b/client/src/assets/player/settings/settings-dialog.ts | |||
diff --git a/client/src/assets/player/videojs-components/settings-menu-button.ts b/client/src/assets/player/settings/settings-menu-button.ts index 6de390f4d..6de390f4d 100644 --- a/client/src/assets/player/videojs-components/settings-menu-button.ts +++ b/client/src/assets/player/settings/settings-menu-button.ts | |||
diff --git a/client/src/assets/player/videojs-components/settings-menu-item.ts b/client/src/assets/player/settings/settings-menu-item.ts index 31d42c456..31d42c456 100644 --- a/client/src/assets/player/videojs-components/settings-menu-item.ts +++ b/client/src/assets/player/settings/settings-menu-item.ts | |||
diff --git a/client/src/assets/player/videojs-components/settings-panel-child.ts b/client/src/assets/player/settings/settings-panel-child.ts index 161420c38..161420c38 100644 --- a/client/src/assets/player/videojs-components/settings-panel-child.ts +++ b/client/src/assets/player/settings/settings-panel-child.ts | |||
diff --git a/client/src/assets/player/videojs-components/settings-panel.ts b/client/src/assets/player/settings/settings-panel.ts index 28b579bdd..28b579bdd 100644 --- a/client/src/assets/player/videojs-components/settings-panel.ts +++ b/client/src/assets/player/settings/settings-panel.ts | |||