aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/assets
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2019-12-18 23:39:07 +0100
committerRigel Kent <sendmemail@rigelk.eu>2019-12-18 23:39:11 +0100
commit96f6278f3e5b35d6e812176c799088f88729a0b0 (patch)
tree6231a912cbe8b7165c72bdbad7cdba079bc0212d /client/src/assets
parent9650937374f7ac9f884a95a465f8c8c8c966bf71 (diff)
downloadPeerTube-96f6278f3e5b35d6e812176c799088f88729a0b0.tar.gz
PeerTube-96f6278f3e5b35d6e812176c799088f88729a0b0.tar.zst
PeerTube-96f6278f3e5b35d6e812176c799088f88729a0b0.zip
respect video history on explicit playlist click
also correct font-weight for .title-page-single, and tooltip dynamic text for playlist loop button. fixes #1889
Diffstat (limited to 'client/src/assets')
-rw-r--r--client/src/assets/player/bezels/bezels-plugin.ts2
-rw-r--r--client/src/assets/player/peertube-player-manager.ts1
2 files changed, 2 insertions, 1 deletions
diff --git a/client/src/assets/player/bezels/bezels-plugin.ts b/client/src/assets/player/bezels/bezels-plugin.ts
index 4317d60f9..c2c251961 100644
--- a/client/src/assets/player/bezels/bezels-plugin.ts
+++ b/client/src/assets/player/bezels/bezels-plugin.ts
@@ -43,7 +43,7 @@ class PauseBezel extends Component {
43 this.options_ = options 43 this.options_ = options
44 44
45 player.on('pause', (_: any) => { 45 player.on('pause', (_: any) => {
46 if (player.seeking()) return 46 if (player.seeking() || player.ended()) return
47 this.container.innerHTML = getPauseBezel() 47 this.container.innerHTML = getPauseBezel()
48 this.showBezel() 48 this.showBezel()
49 }) 49 })
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index ac3609c04..27aa360e6 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -52,6 +52,7 @@ export interface CustomizationOptions {
52 muted?: boolean 52 muted?: boolean
53 loop?: boolean 53 loop?: boolean
54 subtitle?: string 54 subtitle?: string
55 resume?: string
55 56
56 peertubeLink: boolean 57 peertubeLink: boolean
57} 58}