From 950b3ce7f0f8356192b7db7bbe4d507b6d92bf96 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 26 Oct 2021 10:52:14 +0200
Subject: Migrate to @peertube/videojs-contextmenu

To fix a bug with latest videojs
---
 client/package.json                                 |  2 +-
 client/src/assets/player/peertube-player-manager.ts |  2 +-
 client/src/sass/player/context-menu.scss            |  2 +-
 client/yarn.lock                                    | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'client')

diff --git a/client/package.json b/client/package.json
index ede26a3f7..8819068a4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -57,6 +57,7 @@
     "@ngx-loading-bar/router": "^5.0.0",
     "@peertube/p2p-media-loader-core": "^1.0.4",
     "@peertube/p2p-media-loader-hlsjs": "^1.0.6",
+    "@peertube/videojs-contextmenu": "^5.5.0",
     "@types/chart.js": "^2.9.16",
     "@types/core-js": "^2.5.2",
     "@types/debug": "^4.1.5",
@@ -129,7 +130,6 @@
     "tslib": "^2.0.0",
     "typescript": "~4.3.4",
     "video.js": "^7",
-    "videojs-contextmenu-pt": "^5.4.1",
     "videojs-dock": "^2.0.2",
     "videojs-hotkeys": "^0.2.27",
     "videostream": "~3.2.1",
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index b63d693d4..3e6398f50 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -1,6 +1,6 @@
 import 'videojs-hotkeys/videojs.hotkeys'
 import 'videojs-dock'
-import 'videojs-contextmenu-pt'
+import '@peertube/videojs-contextmenu'
 import './upnext/end-card'
 import './upnext/upnext-plugin'
 import './stats/stats-card'
diff --git a/client/src/sass/player/context-menu.scss b/client/src/sass/player/context-menu.scss
index c183d24f4..fef0d30c0 100644
--- a/client/src/sass/player/context-menu.scss
+++ b/client/src/sass/player/context-menu.scss
@@ -4,7 +4,7 @@
 
 $context-menu-width: 350px;
 
-/* Sass for videojs-contextmenu-ui */
+/* Sass for @peertube/videojs-contextmenu */
 
 .video-js .vjs-contextmenu-ui-menu {
   position: absolute;
diff --git a/client/yarn.lock b/client/yarn.lock
index 20941258e..bc68c053f 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1720,6 +1720,14 @@
     events "^3.3.0"
     m3u8-parser "^4.6.0"
 
+"@peertube/videojs-contextmenu@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@peertube/videojs-contextmenu/-/videojs-contextmenu-5.5.0.tgz#d1e8d368ee978fe04dcbcdd1d125a656f7350f55"
+  integrity sha512-+zV/RbrybVJHwqOO+YmtJjTwKM8r695Ax8AbXmNoL3J7NVguqy6TI8XKyQo3g5WHNj5nJozzaJQqDBc+BhKGRw==
+  dependencies:
+    global "^4.4.0"
+    video.js "^7.6.0"
+
 "@polka/url@^1.0.0-next.20":
   version "1.0.0-next.21"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
@@ -12881,14 +12889,6 @@ vfile@^4.0.0:
     videojs-font "3.2.0"
     videojs-vtt.js "^0.15.3"
 
-videojs-contextmenu-pt@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/videojs-contextmenu-pt/-/videojs-contextmenu-pt-5.4.1.tgz#db160cc4bce489ae6d66ef59b85e2a82edae972e"
-  integrity sha512-JtVvmO8fH4vnE6B1tI5efA828nxlc1N/V500/l8Zwvi81VsYVX4EOteTXnP3Rc3o1l9cd22N/t+wenymi3oplw==
-  dependencies:
-    global "^4.4.0"
-    video.js "^7.6.0"
-
 videojs-dock@^2.0.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/videojs-dock/-/videojs-dock-2.2.0.tgz#57e4f942da1b8e930c4387fed85942473bc40829"
-- 
cgit v1.2.3