Reorganize videojs components

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
similarity index 100%
rename from client/src/assets/player/videojs-components/next-previous-video-button.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/p2p-info-button.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/peertube-link-button.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/peertube-load-progress-bar.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/theater-button.ts
rename to 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 9d2b29811563ad6f466d0ab499bf6ec4fde0f78d..81ddb8814bc9aeb673b0eb442f6e8f04c1c29f14 100644 (file)
--- 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'
 import './bezels/bezels-plugin'
 import './peertube-plugin'
 import './peertube-resolutions-plugin'
-import './videojs-components/next-previous-video-button'
-import './videojs-components/p2p-info-button'
-import './videojs-components/peertube-link-button'
-import './videojs-components/peertube-load-progress-bar'
-import './videojs-components/resolution-menu-button'
-import './videojs-components/resolution-menu-item'
-import './videojs-components/settings-dialog'
-import './videojs-components/settings-menu-button'
-import './videojs-components/settings-menu-item'
-import './videojs-components/settings-panel'
-import './videojs-components/settings-panel-child'
-import './videojs-components/theater-button'
+import './control-bar/next-previous-video-button'
+import './control-bar/p2p-info-button'
+import './control-bar/peertube-link-button'
+import './control-bar/peertube-load-progress-bar'
+import './control-bar/resolution-menu-button'
+import './control-bar/resolution-menu-item'
+import './control-bar/settings-dialog'
+import './control-bar/settings-menu-button'
+import './control-bar/settings-menu-item'
+import './control-bar/settings-panel'
+import './control-bar/settings-panel-child'
+import './control-bar/theater-button'
 import './playlist/playlist-plugin'
 import './mobile/peertube-mobile-plugin'
 import './mobile/peertube-mobile-buttons'

diff --git a/client/src/assets/player/peertube-plugin.ts b/client/src/assets/player/peertube-plugin.ts
index b5c42d1c555305bad66d53fca0e2a8b992cb0ece..4ffc9ce3e7b5b964c7bfffc2104f7e22c758cbf1 100644 (file)
--- a/client/src/assets/player/peertube-plugin.ts
+++ b/client/src/assets/player/peertube-plugin.ts
@@ -1,3 +1,4 @@
+import debug from 'debug'
 import videojs from 'video.js'
 import { timeToInt } from '@shared/core-utils'
 import {
@@ -10,9 +11,8 @@ import {
   saveVolumeInStore
 } from './peertube-player-local-storage'
 import { PeerTubePluginOptions, UserWatching, VideoJSCaption } from './peertube-videojs-typings'
+import { SettingsButton } from './settings/settings-menu-button'
 import { isMobile } from './utils'
-import { SettingsButton } from './videojs-components/settings-menu-button'
-import debug from 'debug'
 
 const logger = debug('peertube:player:peertube')
 

diff --git a/client/src/assets/player/videojs-components/resolution-menu-button.ts b/client/src/assets/player/settings/resolution-menu-button.ts
similarity index 100%
rename from client/src/assets/player/videojs-components/resolution-menu-button.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/resolution-menu-item.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/settings-dialog.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/settings-menu-button.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/settings-menu-item.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/settings-panel-child.ts
rename to 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
similarity index 100%
rename from client/src/assets/player/videojs-components/settings-panel.ts
rename to client/src/assets/player/settings/settings-panel.ts