OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't play video if user paused it during loading

pull/213/merge
Chocobozzz 2018-01-23 15:01:54 +01:00
parent 8c4890cbfe
commit 531ab5b627
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/assets/player/peertube-videojs-plugin.ts
View File

@ -56,7 +56,8 @@ class ResolutionMenuItem extends MenuItem {
} }
handleClick (event) { handleClick (event) {
MenuItem.prototype.handleClick.call(this, event) super.handleClick(event)
this.player_.peertube().updateResolution(this.options_.id) this.player_.peertube().updateResolution(this.options_.id)
} }
} }
@ -279,14 +280,14 @@ class PeerTubePlugin extends Plugin {
if (err) return this.handleError(err) if (err) return this.handleError(err)
this.renderer = renderer this.renderer = renderer
this.player.play().then(done) if (!this.player.paused()) this.player.play().then(done)
}) })
}) })
this.torrent.on('error', err => this.handleError(err)) this.torrent.on('error', err => this.handleError(err))
this.torrent.on('warning', (err: any) => { this.torrent.on('warning', (err: any) => {
// We don't support HTTP tracker but we don't care -> we use the web socket tracker // We don't support HTTP tracker but we don't care -> we use the web socket tracker
if (err.message.indexOf('Unsupported tracker protocol: http') !== -1) return if (err.message.indexOf('Unsupported tracker protocol') !== -1) return
// Users don't care about issues with WebRTC, but developers do so log it in the console // Users don't care about issues with WebRTC, but developers do so log it in the console
if (err.message.indexOf('Ice connection failed') !== -1) { if (err.message.indexOf('Ice connection failed') !== -1) {
console.error(err) console.error(err)
@ -304,6 +305,9 @@ class PeerTubePlugin extends Plugin {
const currentTime = this.player.currentTime() const currentTime = this.player.currentTime()
const isPaused = this.player.paused() const isPaused = this.player.paused()
// Remove poster to have black background
this.playerElement.poster = ''
// Hide bigPlayButton // Hide bigPlayButton
if (!isPaused) { if (!isPaused) {
this.player.bigPlayButton.hide() this.player.bigPlayButton.hide()