diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-05 11:15:06 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-05 11:22:38 +0200 |
commit | 6e46de095d7169355dd83030f6ce4a582304153a (patch) | |
tree | dfa78e2008d3d135a00b798b05350b4975145acc /client/src/assets/player/peertube-player.ts | |
parent | a585824160d016db7c9bff0e1cb1ffa3aaf73d74 (diff) | |
download | PeerTube-6e46de095d7169355dd83030f6ce4a582304153a.tar.gz PeerTube-6e46de095d7169355dd83030f6ce4a582304153a.tar.zst PeerTube-6e46de095d7169355dd83030f6ce4a582304153a.zip |
Add user history and resume videos
Diffstat (limited to 'client/src/assets/player/peertube-player.ts')
-rw-r--r-- | client/src/assets/player/peertube-player.ts | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts index 1bf6c9267..792662b6c 100644 --- a/client/src/assets/player/peertube-player.ts +++ b/client/src/assets/player/peertube-player.ts | |||
@@ -10,7 +10,7 @@ import './webtorrent-info-button' | |||
10 | import './peertube-videojs-plugin' | 10 | import './peertube-videojs-plugin' |
11 | import './peertube-load-progress-bar' | 11 | import './peertube-load-progress-bar' |
12 | import './theater-button' | 12 | import './theater-button' |
13 | import { VideoJSCaption, videojsUntyped } from './peertube-videojs-typings' | 13 | import { UserWatching, VideoJSCaption, videojsUntyped } from './peertube-videojs-typings' |
14 | import { buildVideoEmbed, buildVideoLink, copyToClipboard } from './utils' | 14 | import { buildVideoEmbed, buildVideoLink, copyToClipboard } from './utils' |
15 | import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n' | 15 | import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n' |
16 | 16 | ||
@@ -34,10 +34,13 @@ function getVideojsOptions (options: { | |||
34 | startTime: number | string | 34 | startTime: number | string |
35 | theaterMode: boolean, | 35 | theaterMode: boolean, |
36 | videoCaptions: VideoJSCaption[], | 36 | videoCaptions: VideoJSCaption[], |
37 | |||
37 | language?: string, | 38 | language?: string, |
38 | controls?: boolean, | 39 | controls?: boolean, |
39 | muted?: boolean, | 40 | muted?: boolean, |
40 | loop?: boolean | 41 | loop?: boolean |
42 | |||
43 | userWatching?: UserWatching | ||
41 | }) { | 44 | }) { |
42 | const videojsOptions = { | 45 | const videojsOptions = { |
43 | // We don't use text track settings for now | 46 | // We don't use text track settings for now |
@@ -57,7 +60,8 @@ function getVideojsOptions (options: { | |||
57 | playerElement: options.playerElement, | 60 | playerElement: options.playerElement, |
58 | videoViewUrl: options.videoViewUrl, | 61 | videoViewUrl: options.videoViewUrl, |
59 | videoDuration: options.videoDuration, | 62 | videoDuration: options.videoDuration, |
60 | startTime: options.startTime | 63 | startTime: options.startTime, |
64 | userWatching: options.userWatching | ||
61 | } | 65 | } |
62 | }, | 66 | }, |
63 | controlBar: { | 67 | controlBar: { |