diff options
author | Chocobozzz <me@florianbigard.com> | 2021-10-26 10:52:14 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-10-26 11:24:05 +0200 |
commit | 950b3ce7f0f8356192b7db7bbe4d507b6d92bf96 (patch) | |
tree | 9e9d70a9f3e68d27ae9b6fa65e7c453715b5f70d | |
parent | d91a0341a7374e2739a29d8b4766bd98f7a98efd (diff) | |
download | PeerTube-950b3ce7f0f8356192b7db7bbe4d507b6d92bf96.tar.gz PeerTube-950b3ce7f0f8356192b7db7bbe4d507b6d92bf96.tar.zst PeerTube-950b3ce7f0f8356192b7db7bbe4d507b6d92bf96.zip |
Migrate to @peertube/videojs-contextmenu
To fix a bug with latest videojs
-rw-r--r-- | client/package.json | 2 | ||||
-rw-r--r-- | client/src/assets/player/peertube-player-manager.ts | 2 | ||||
-rw-r--r-- | client/src/sass/player/context-menu.scss | 2 | ||||
-rw-r--r-- | client/yarn.lock | 16 |
4 files changed, 11 insertions, 11 deletions
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 @@ | |||
57 | "@ngx-loading-bar/router": "^5.0.0", | 57 | "@ngx-loading-bar/router": "^5.0.0", |
58 | "@peertube/p2p-media-loader-core": "^1.0.4", | 58 | "@peertube/p2p-media-loader-core": "^1.0.4", |
59 | "@peertube/p2p-media-loader-hlsjs": "^1.0.6", | 59 | "@peertube/p2p-media-loader-hlsjs": "^1.0.6", |
60 | "@peertube/videojs-contextmenu": "^5.5.0", | ||
60 | "@types/chart.js": "^2.9.16", | 61 | "@types/chart.js": "^2.9.16", |
61 | "@types/core-js": "^2.5.2", | 62 | "@types/core-js": "^2.5.2", |
62 | "@types/debug": "^4.1.5", | 63 | "@types/debug": "^4.1.5", |
@@ -129,7 +130,6 @@ | |||
129 | "tslib": "^2.0.0", | 130 | "tslib": "^2.0.0", |
130 | "typescript": "~4.3.4", | 131 | "typescript": "~4.3.4", |
131 | "video.js": "^7", | 132 | "video.js": "^7", |
132 | "videojs-contextmenu-pt": "^5.4.1", | ||
133 | "videojs-dock": "^2.0.2", | 133 | "videojs-dock": "^2.0.2", |
134 | "videojs-hotkeys": "^0.2.27", | 134 | "videojs-hotkeys": "^0.2.27", |
135 | "videostream": "~3.2.1", | 135 | "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 @@ | |||
1 | import 'videojs-hotkeys/videojs.hotkeys' | 1 | import 'videojs-hotkeys/videojs.hotkeys' |
2 | import 'videojs-dock' | 2 | import 'videojs-dock' |
3 | import 'videojs-contextmenu-pt' | 3 | import '@peertube/videojs-contextmenu' |
4 | import './upnext/end-card' | 4 | import './upnext/end-card' |
5 | import './upnext/upnext-plugin' | 5 | import './upnext/upnext-plugin' |
6 | import './stats/stats-card' | 6 | 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 @@ | |||
4 | 4 | ||
5 | $context-menu-width: 350px; | 5 | $context-menu-width: 350px; |
6 | 6 | ||
7 | /* Sass for videojs-contextmenu-ui */ | 7 | /* Sass for @peertube/videojs-contextmenu */ |
8 | 8 | ||
9 | .video-js .vjs-contextmenu-ui-menu { | 9 | .video-js .vjs-contextmenu-ui-menu { |
10 | position: absolute; | 10 | 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 @@ | |||
1720 | events "^3.3.0" | 1720 | events "^3.3.0" |
1721 | m3u8-parser "^4.6.0" | 1721 | m3u8-parser "^4.6.0" |
1722 | 1722 | ||
1723 | "@peertube/videojs-contextmenu@^5.5.0": | ||
1724 | version "5.5.0" | ||
1725 | resolved "https://registry.yarnpkg.com/@peertube/videojs-contextmenu/-/videojs-contextmenu-5.5.0.tgz#d1e8d368ee978fe04dcbcdd1d125a656f7350f55" | ||
1726 | integrity sha512-+zV/RbrybVJHwqOO+YmtJjTwKM8r695Ax8AbXmNoL3J7NVguqy6TI8XKyQo3g5WHNj5nJozzaJQqDBc+BhKGRw== | ||
1727 | dependencies: | ||
1728 | global "^4.4.0" | ||
1729 | video.js "^7.6.0" | ||
1730 | |||
1723 | "@polka/url@^1.0.0-next.20": | 1731 | "@polka/url@^1.0.0-next.20": |
1724 | version "1.0.0-next.21" | 1732 | version "1.0.0-next.21" |
1725 | resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" | 1733 | resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" |
@@ -12881,14 +12889,6 @@ vfile@^4.0.0: | |||
12881 | videojs-font "3.2.0" | 12889 | videojs-font "3.2.0" |
12882 | videojs-vtt.js "^0.15.3" | 12890 | videojs-vtt.js "^0.15.3" |
12883 | 12891 | ||
12884 | videojs-contextmenu-pt@^5.4.1: | ||
12885 | version "5.4.1" | ||
12886 | resolved "https://registry.yarnpkg.com/videojs-contextmenu-pt/-/videojs-contextmenu-pt-5.4.1.tgz#db160cc4bce489ae6d66ef59b85e2a82edae972e" | ||
12887 | integrity sha512-JtVvmO8fH4vnE6B1tI5efA828nxlc1N/V500/l8Zwvi81VsYVX4EOteTXnP3Rc3o1l9cd22N/t+wenymi3oplw== | ||
12888 | dependencies: | ||
12889 | global "^4.4.0" | ||
12890 | video.js "^7.6.0" | ||
12891 | |||
12892 | videojs-dock@^2.0.2: | 12892 | videojs-dock@^2.0.2: |
12893 | version "2.2.0" | 12893 | version "2.2.0" |
12894 | resolved "https://registry.yarnpkg.com/videojs-dock/-/videojs-dock-2.2.0.tgz#57e4f942da1b8e930c4387fed85942473bc40829" | 12894 | resolved "https://registry.yarnpkg.com/videojs-dock/-/videojs-dock-2.2.0.tgz#57e4f942da1b8e930c4387fed85942473bc40829" |