aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-04-08 09:36:51 +0200
committerChocobozzz <me@florianbigard.com>2020-04-08 09:36:51 +0200
commit9cdeb80650d90b80f74d6453d8f50e6855b2c819 (patch)
tree5dfad5f6b5bb6c14b59490e15d0ad1010bd831e7
parentfd69c52f8477c44ce506f5a44bc5ee394cad0ef0 (diff)
downloadPeerTube-9cdeb80650d90b80f74d6453d8f50e6855b2c819.tar.gz
PeerTube-9cdeb80650d90b80f74d6453d8f50e6855b2c819.tar.zst
PeerTube-9cdeb80650d90b80f74d6453d8f50e6855b2c819.zip
Fix videojs subtitles
-rw-r--r--client/package.json1
-rw-r--r--client/src/assets/player/peertube-player-manager.ts3
-rw-r--r--client/tsconfig.json2
-rw-r--r--client/yarn.lock5
4 files changed, 1 insertions, 10 deletions
diff --git a/client/package.json b/client/package.json
index 31d620b45..91be5eef5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -126,7 +126,6 @@
126 "videojs-dock": "^2.0.2", 126 "videojs-dock": "^2.0.2",
127 "videojs-hotkeys": "^0.2.21", 127 "videojs-hotkeys": "^0.2.21",
128 "videostream": "~3.2.1", 128 "videostream": "~3.2.1",
129 "vtt.js": "^0.13.0",
130 "webpack-bundle-analyzer": "^3.0.2", 129 "webpack-bundle-analyzer": "^3.0.2",
131 "webpack-cli": "^3.0.8", 130 "webpack-cli": "^3.0.8",
132 "webtorrent": "^0.108.1", 131 "webtorrent": "^0.108.1",
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index 8e6a4f139..6d9236a9d 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -29,9 +29,6 @@ import { RedundancyUrlManager } from './p2p-media-loader/redundancy-url-manager'
29import { getStoredP2PEnabled } from './peertube-player-local-storage' 29import { getStoredP2PEnabled } from './peertube-player-local-storage'
30import { TranslationsManager } from './translations-manager' 30import { TranslationsManager } from './translations-manager'
31 31
32// For VideoJS
33(window as any).WebVTT = require('vtt.js/lib/vtt.js').WebVTT;
34
35// Change 'Playback Rate' to 'Speed' (smaller for our settings menu) 32// Change 'Playback Rate' to 'Speed' (smaller for our settings menu)
36(videojs.getComponent('PlaybackRateMenuButton') as any).prototype.controlText_ = 'Speed' 33(videojs.getComponent('PlaybackRateMenuButton') as any).prototype.controlText_ = 'Speed'
37 34
diff --git a/client/tsconfig.json b/client/tsconfig.json
index fbdeb6d5d..3c671e579 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -26,7 +26,7 @@
26 "paths": { 26 "paths": {
27 "@app/*": [ "src/app/*" ], 27 "@app/*": [ "src/app/*" ],
28 "@shared/*": [ "../shared/*" ], 28 "@shared/*": [ "../shared/*" ],
29 "video.js": [ "node_modules/video.js/dist/alt/video.core.novtt" ], 29 "video.js": [ "node_modules/video.js/dist/alt/video.core" ],
30 "fs": [ "src/shims/noop" ], 30 "fs": [ "src/shims/noop" ],
31 "http": [ "src/shims/http" ], 31 "http": [ "src/shims/http" ],
32 "https": [ "src/shims/https" ], 32 "https": [ "src/shims/https" ],
diff --git a/client/yarn.lock b/client/yarn.lock
index 433c07d4f..1ed95aaed 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -11505,11 +11505,6 @@ void-elements@^2.0.0:
11505 resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" 11505 resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
11506 integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= 11506 integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
11507 11507
11508vtt.js@^0.13.0:
11509 version "0.13.0"
11510 resolved "https://registry.yarnpkg.com/vtt.js/-/vtt.js-0.13.0.tgz#955c667b34d5325b2012cb9e8ba9bad6e0b11ff8"
11511 integrity sha1-lVxmezTVMlsgEsuei6m61uCxH/g=
11512
11513watchpack@^1.6.0: 11508watchpack@^1.6.0:
11514 version "1.6.1" 11509 version "1.6.1"
11515 resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2" 11510 resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"