aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-03-14 10:27:05 +0100
committerChocobozzz <me@florianbigard.com>2022-03-14 10:27:05 +0100
commit9af2accee68082e4e1160a4e4a7036451262be02 (patch)
tree50d74a901068c00cf16d65133bc0ddb842293b79
parent637a10afb5d539b04a653abbe9b0309eb4cbf7c6 (diff)
downloadPeerTube-9af2accee68082e4e1160a4e4a7036451262be02.tar.gz
PeerTube-9af2accee68082e4e1160a4e4a7036451262be02.tar.zst
PeerTube-9af2accee68082e4e1160a4e4a7036451262be02.zip
Reorganize videojs components
-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.ts24
-rw-r--r--client/src/assets/player/peertube-plugin.ts4
-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'
6import './bezels/bezels-plugin' 6import './bezels/bezels-plugin'
7import './peertube-plugin' 7import './peertube-plugin'
8import './peertube-resolutions-plugin' 8import './peertube-resolutions-plugin'
9import './videojs-components/next-previous-video-button' 9import './control-bar/next-previous-video-button'
10import './videojs-components/p2p-info-button' 10import './control-bar/p2p-info-button'
11import './videojs-components/peertube-link-button' 11import './control-bar/peertube-link-button'
12import './videojs-components/peertube-load-progress-bar' 12import './control-bar/peertube-load-progress-bar'
13import './videojs-components/resolution-menu-button' 13import './control-bar/resolution-menu-button'
14import './videojs-components/resolution-menu-item' 14import './control-bar/resolution-menu-item'
15import './videojs-components/settings-dialog' 15import './control-bar/settings-dialog'
16import './videojs-components/settings-menu-button' 16import './control-bar/settings-menu-button'
17import './videojs-components/settings-menu-item' 17import './control-bar/settings-menu-item'
18import './videojs-components/settings-panel' 18import './control-bar/settings-panel'
19import './videojs-components/settings-panel-child' 19import './control-bar/settings-panel-child'
20import './videojs-components/theater-button' 20import './control-bar/theater-button'
21import './playlist/playlist-plugin' 21import './playlist/playlist-plugin'
22import './mobile/peertube-mobile-plugin' 22import './mobile/peertube-mobile-plugin'
23import './mobile/peertube-mobile-buttons' 23import './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 @@
1import debug from 'debug'
1import videojs from 'video.js' 2import videojs from 'video.js'
2import { timeToInt } from '@shared/core-utils' 3import { timeToInt } from '@shared/core-utils'
3import { 4import {
@@ -10,9 +11,8 @@ import {
10 saveVolumeInStore 11 saveVolumeInStore
11} from './peertube-player-local-storage' 12} from './peertube-player-local-storage'
12import { PeerTubePluginOptions, UserWatching, VideoJSCaption } from './peertube-videojs-typings' 13import { PeerTubePluginOptions, UserWatching, VideoJSCaption } from './peertube-videojs-typings'
14import { SettingsButton } from './settings/settings-menu-button'
13import { isMobile } from './utils' 15import { isMobile } from './utils'
14import { SettingsButton } from './videojs-components/settings-menu-button'
15import debug from 'debug'
16 16
17const logger = debug('peertube:player:peertube') 17const 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