aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/assets
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-10-19 14:58:28 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-10-19 14:58:28 +0200
commita96aed15188174c50885dda0df3164a67295e11f (patch)
tree7e3941324614e52a2f6ab7755224ab8ae8f8c19f /client/src/assets
parentbda65bdc9f3ce7d4b6e97cb9afaca25b71added3 (diff)
downloadPeerTube-a96aed15188174c50885dda0df3164a67295e11f.tar.gz
PeerTube-a96aed15188174c50885dda0df3164a67295e11f.tar.zst
PeerTube-a96aed15188174c50885dda0df3164a67295e11f.zip
Add ability to download a video from direct link or torrent file
Diffstat (limited to 'client/src/assets')
-rw-r--r--client/src/assets/player/peertube-videojs-plugin.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts
index 7cf3ea6cc..19490baf2 100644
--- a/client/src/assets/player/peertube-videojs-plugin.ts
+++ b/client/src/assets/player/peertube-videojs-plugin.ts
@@ -158,7 +158,12 @@ const peertubePlugin = function (options: PeertubePluginOptions) {
158 }) 158 })
159 159
160 player.torrent.on('error', err => handleError(err)) 160 player.torrent.on('error', err => handleError(err))
161 player.torrent.on('warning', err => handleError(err)) 161 player.torrent.on('warning', err => {
162 // We don't support HTTP tracker but we don't care -> we use the web socket tracker
163 if (err.message.indexOf('Unsupported tracker protocol: http://') !== -1) return
164
165 return handleError(err)
166 })
162 167
163 player.trigger('videoFileUpdate') 168 player.trigger('videoFileUpdate')
164 169