From: Chocobozzz <me@florianbigard.com>
Date: Wed, 8 Apr 2020 07:36:51 +0000 (+0200)
Subject: Fix videojs subtitles
X-Git-Tag: v2.2.0-rc.1~268
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9cdeb80650d90b80f74d6453d8f50e6855b2c819;p=github%2FChocobozzz%2FPeerTube.git

Fix videojs subtitles
---

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 @@
     "videojs-dock": "^2.0.2",
     "videojs-hotkeys": "^0.2.21",
     "videostream": "~3.2.1",
-    "vtt.js": "^0.13.0",
     "webpack-bundle-analyzer": "^3.0.2",
     "webpack-cli": "^3.0.8",
     "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'
 import { getStoredP2PEnabled } from './peertube-player-local-storage'
 import { TranslationsManager } from './translations-manager'
 
-// For VideoJS
-(window as any).WebVTT = require('vtt.js/lib/vtt.js').WebVTT;
-
 // Change 'Playback Rate' to 'Speed' (smaller for our settings menu)
 (videojs.getComponent('PlaybackRateMenuButton') as any).prototype.controlText_ = 'Speed'
 
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 @@
     "paths": {
       "@app/*": [ "src/app/*" ],
       "@shared/*": [ "../shared/*" ],
-      "video.js": [ "node_modules/video.js/dist/alt/video.core.novtt" ],
+      "video.js": [ "node_modules/video.js/dist/alt/video.core" ],
       "fs": [ "src/shims/noop" ],
       "http": [ "src/shims/http" ],
       "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:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
-vtt.js@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/vtt.js/-/vtt.js-0.13.0.tgz#955c667b34d5325b2012cb9e8ba9bad6e0b11ff8"
-  integrity sha1-lVxmezTVMlsgEsuei6m61uCxH/g=
-
 watchpack@^1.6.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"