From: Chocobozzz <me@florianbigard.com>
Date: Wed, 26 Feb 2020 14:26:02 +0000 (+0100)
Subject: Merge branch 'release/2.1.0' into develop
X-Git-Tag: v2.2.0-rc.1~449
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=818c449b3c34e9f324ac744120c8774e724ab25e;p=oweals%2Fpeertube.git

Merge branch 'release/2.1.0' into develop
---

818c449b3c34e9f324ac744120c8774e724ab25e
diff --cc client/src/standalone/videos/embed.ts
index d5b42a025,5213443fc..e3bcbc010
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@@ -261,19 -261,22 +261,22 @@@ export class PeerTubeEmbed 
    }
  
    private async buildDock (videoInfo: VideoDetails, configResponse: Response) {
 -    if (this.controls) {
 -      // On webtorrent fallback, player may have been disposed
 -      if (!this.player.player_) return
 +    if (!this.controls) return
  
 -      const title = this.title ? videoInfo.name : undefined
++    // On webtorrent fallback, player may have been disposed
++    if (!this.player.player_) return
+ 
 -      const config: ServerConfig = await configResponse.json()
 -      const description = config.tracker.enabled && this.warningTitle
 -        ? '<span class="text">' + this.player.localize('Watching this video may reveal your IP address to others.') + '</span>'
 -        : undefined
 +    const title = this.title ? videoInfo.name : undefined
  
 -      this.player.dock({
 -        title,
 -        description
 -      })
 -    }
 +    const config: ServerConfig = await configResponse.json()
 +    const description = config.tracker.enabled && this.warningTitle
 +      ? '<span class="text">' + peertubeTranslate('Watching this video may reveal your IP address to others.') + '</span>'
 +      : undefined
 +
 +    this.player.dock({
 +      title,
 +      description
 +    })
    }
  
    private buildCSS () {