aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-02-26 15:26:02 +0100
committerChocobozzz <me@florianbigard.com>2020-02-26 15:26:02 +0100
commit818c449b3c34e9f324ac744120c8774e724ab25e (patch)
treeca470149152d49ee3a40b46f779fd01008e7a9c3
parent4832e41584044cdc6c4ef9852d458031326b164d (diff)
parentc002261381a4dd0b07dd6706942d446b237fd8f4 (diff)
downloadPeerTube-818c449b3c34e9f324ac744120c8774e724ab25e.tar.gz
PeerTube-818c449b3c34e9f324ac744120c8774e724ab25e.tar.zst
PeerTube-818c449b3c34e9f324ac744120c8774e724ab25e.zip
Merge branch 'release/2.1.0' into develop
-rw-r--r--client/src/app/menu/menu.component.scss12
-rw-r--r--client/src/standalone/videos/embed.ts3
2 files changed, 7 insertions, 8 deletions
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index dec045928..40c9a2b25 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -255,17 +255,13 @@ menu {
255@media screen and (max-width: $mobile-view) { 255@media screen and (max-width: $mobile-view) {
256 .menu-wrapper { 256 .menu-wrapper {
257 width: 100% !important; 257 width: 100% !important;
258 }
259
260 .top-menu, .footer {
261 width: 100% !important;
262 }
263}
264 258
265@media (hover: none) and (pointer: coarse) {
266 .menu-wrapper {
267 menu { 259 menu {
268 overflow-y: auto; 260 overflow-y: auto;
269 } 261 }
270 } 262 }
263
264 .top-menu, .footer {
265 width: 100% !important;
266 }
271} 267}
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index d5b42a025..e3bcbc010 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -263,6 +263,9 @@ export class PeerTubeEmbed {
263 private async buildDock (videoInfo: VideoDetails, configResponse: Response) { 263 private async buildDock (videoInfo: VideoDetails, configResponse: Response) {
264 if (!this.controls) return 264 if (!this.controls) return
265 265
266 // On webtorrent fallback, player may have been disposed
267 if (!this.player.player_) return
268
266 const title = this.title ? videoInfo.name : undefined 269 const title = this.title ? videoInfo.name : undefined
267 270
268 const config: ServerConfig = await configResponse.json() 271 const config: ServerConfig = await configResponse.json()