aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/assets/player
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-05-22 16:02:29 +0200
committerChocobozzz <me@florianbigard.com>2018-05-22 16:02:29 +0200
commitd1bd87e066633b8a66266b280327ec828980916b (patch)
treebfb30a565088cbb2675a8ab224b1ae1fc5dbfd16 /client/src/assets/player
parent293c885b5c6d4d694792cf430c51d73ecd1f3bee (diff)
downloadPeerTube-d1bd87e066633b8a66266b280327ec828980916b.tar.gz
PeerTube-d1bd87e066633b8a66266b280327ec828980916b.tar.zst
PeerTube-d1bd87e066633b8a66266b280327ec828980916b.zip
Make it works with new autoplay policy
Diffstat (limited to 'client/src/assets/player')
-rw-r--r--client/src/assets/player/peertube-player.ts16
-rw-r--r--client/src/assets/player/peertube-videojs-plugin.ts14
-rw-r--r--client/src/assets/player/utils.ts5
3 files changed, 17 insertions, 18 deletions
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
index 2e77a973f..f419d58fc 100644
--- a/client/src/assets/player/peertube-player.ts
+++ b/client/src/assets/player/peertube-player.ts
@@ -1,21 +1,5 @@
1import { VideoFile } from '../../../../shared/models/videos' 1import { VideoFile } from '../../../../shared/models/videos'
2 2
3import 'core-js/es6/symbol';
4import 'core-js/es6/object';
5import 'core-js/es6/function';
6import 'core-js/es6/parse-int';
7import 'core-js/es6/parse-float';
8import 'core-js/es6/number';
9import 'core-js/es6/math';
10import 'core-js/es6/string';
11import 'core-js/es6/date';
12import 'core-js/es6/array';
13import 'core-js/es6/regexp';
14import 'core-js/es6/map';
15import 'core-js/es6/weak-map';
16import 'core-js/es6/set';
17import 'core-js/es7/object';
18
19import 'videojs-hotkeys' 3import 'videojs-hotkeys'
20import 'videojs-dock' 4import 'videojs-dock'
21import './peertube-link-button' 5import './peertube-link-button'
diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts
index 5789641fe..1e68100d1 100644
--- a/client/src/assets/player/peertube-videojs-plugin.ts
+++ b/client/src/assets/player/peertube-videojs-plugin.ts
@@ -4,7 +4,15 @@ import { VideoFile } from '../../../../shared/models/videos/video.model'
4import { renderVideo } from './video-renderer' 4import { renderVideo } from './video-renderer'
5import './settings-menu-button' 5import './settings-menu-button'
6import { PeertubePluginOptions, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' 6import { PeertubePluginOptions, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings'
7import { getAverageBandwidth, getStoredMute, getStoredVolume, saveAverageBandwidth, saveMuteInStore, saveVolumeInStore } from './utils' 7import {
8 getAverageBandwidth,
9 getStoredMute,
10 getStoredVolume,
11 isMobile,
12 saveAverageBandwidth,
13 saveMuteInStore,
14 saveVolumeInStore
15} from './utils'
8import minBy from 'lodash-es/minBy' 16import minBy from 'lodash-es/minBy'
9import maxBy from 'lodash-es/maxBy' 17import maxBy from 'lodash-es/maxBy'
10import * as CacheChunkStore from 'cache-chunk-store' 18import * as CacheChunkStore from 'cache-chunk-store'
@@ -262,7 +270,6 @@ class PeerTubePlugin extends Plugin {
262 270
263 private tryToPlay (done?: Function) { 271 private tryToPlay (done?: Function) {
264 if (!done) done = function () { /* empty */ } 272 if (!done) done = function () { /* empty */ }
265
266 const playPromise = this.player.play() 273 const playPromise = this.player.play()
267 if (playPromise !== undefined) { 274 if (playPromise !== undefined) {
268 return playPromise.then(done) 275 return playPromise.then(done)
@@ -348,6 +355,9 @@ class PeerTubePlugin extends Plugin {
348 // Proxy first play 355 // Proxy first play
349 const oldPlay = this.player.play.bind(this.player) 356 const oldPlay = this.player.play.bind(this.player)
350 this.player.play = () => { 357 this.player.play = () => {
358 // Avoid issue new play policy on mobiles
359 if (isMobile()) oldPlay()
360
351 this.player.addClass('vjs-has-big-play-button-clicked') 361 this.player.addClass('vjs-has-big-play-button-clicked')
352 this.player.play = oldPlay 362 this.player.play = oldPlay
353 363
diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index f5407ef60..1df39d4e4 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -60,6 +60,10 @@ function saveAverageBandwidth (value: number) {
60 return setLocalStorage('average-bandwidth', value.toString()) 60 return setLocalStorage('average-bandwidth', value.toString())
61} 61}
62 62
63function isMobile () {
64 return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
65}
66
63export { 67export {
64 toTitleCase, 68 toTitleCase,
65 getStoredVolume, 69 getStoredVolume,
@@ -68,6 +72,7 @@ export {
68 getAverageBandwidth, 72 getAverageBandwidth,
69 saveMuteInStore, 73 saveMuteInStore,
70 getStoredMute, 74 getStoredMute,
75 isMobile,
71 bytes 76 bytes
72} 77}
73 78