From 2ead7732a7f80e55e40b7a727f13b56cd6b9dcc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 14 Oct 2020 18:03:17 +0200
Subject: [PATCH] Fix app sidebar mountpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 apps/files/js/dist/sidebar.js     | Bin 606795 -> 606816 bytes
 apps/files/js/dist/sidebar.js.map | Bin 2178834 -> 2178883 bytes
 apps/files/src/sidebar.js         |   7 ++++---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
index 14c75b0d7ab96216b26242a8e939cc74ff3c9c65..dbbee88d0eaf540f19603d70aa59425b0aa1d14b 100644
GIT binary patch
delta 106
zcmX@zqWYjkwV{Qvg{g(Pg{6hHg{_6Xg<}inDTm2%fB2_o*)s8oC?(~mR4Ujh=q2ap
xm89mCC~4NzOi#3B5*LTbD8pr}Gt)Fur@wdL)SsR#%_KGb{udV3=}C^9F9D6EBq9I+

delta 103
zcmaFRqI$YTwV{Qvg{g(Pg{6hHg{_6Xg<}inDF^1vG>z#O<ynNM+dFcy@g(Qxm89mC
mC~2yxDZ+&%nNn@x95!ya8l95Kj@u=sU--ttHoe@D^CbYfb|HZP

diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
index c8624be379994e00def6bd3ffb00963eb3d57fc1..acacae714aa0ffbfb037f1267779892009c0b389 100644
GIT binary patch
delta 306
zcmbRAuZ8h25I3|iwlK9Yx3ILZwy?FZw{Wy@ZsB^{;qPqhtmEnE=xbo%q2uc4nCWDg
z=cyCy=ooBL;H;DE=$NdN@8sxg=xhq)q6p_YIl3D=>9{*OdRkbz0nKoA1!|qn+sP%@
z?$yZ!#N0s41H`;Q%m>8$Kr8^nf<P<;#KJ%<0>q*~EC$5lKr8{ol0Ym4#L_@41H`gG
z3^G%GyH}@z(B|nvwu%bV_dXWqmrBY{sZ_92&`ZwGD@n~OQP+&giz$gIsi{$zzCl4q
nLKrHqj3hrj!bZ_R5GvrBlbQ?Er>RgqeZ7rh=JrTi#hr`*i%n(B

delta 277
zcmX^7uZ3|E5I3|iwlK9Yx3ILZwy?FZw{Wy@ZsB^{q2OxltmE$J=$YZ86YS_1Twdy~
zlj`W0s*~vGUgA_y>OS43lS@uM+tf+N)zLB2$uQ3oRb9BFbCq*@R3{e@a|1CC5c2{t
z9}x2cu>cSY0<jPf3j?tT5Q_q_7!ZpCu>=rH0<jbjO9QbC5X%Cw91zQIkLpwq+C2S<
zjiQcvN`7)_ZfahMUV3VYYfdVN=~U^NqM@FgpH~9psB3B}RLA5^SF}~koL*$3C^g++
QrVtlDnwsr3wu;9Y0mlqr4gdfE

diff --git a/apps/files/src/sidebar.js b/apps/files/src/sidebar.js
index 54293bd24c8..9bf34680ebc 100644
--- a/apps/files/src/sidebar.js
+++ b/apps/files/src/sidebar.js
@@ -37,12 +37,13 @@ Object.assign(window.OCA.Files, { Sidebar: new Sidebar() })
 Object.assign(window.OCA.Files.Sidebar, { Tab })
 
 window.addEventListener('DOMContentLoaded', function() {
-	// Make sure we have a proper layout
-	if (document.getElementById('content')) {
+	const contentElement = document.querySelector('body > .content')
+		|| document.querySelector('body > #content')
 
+	// Make sure we have a proper layout
+	if (contentElement) {
 		// Make sure we have a mountpoint
 		if (!document.getElementById('app-sidebar')) {
-			const contentElement = document.getElementById('content')
 			const sidebarElement = document.createElement('div')
 			sidebarElement.id = 'app-sidebar'
 			contentElement.appendChild(sidebarElement)
-- 
GitLab