From 2e52bdda210dbce59a65854792e83ee8fbd182b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Thu, 16 Jan 2020 16:51:47 +0100
Subject: [PATCH] Close handling
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 403634 -> 403613 bytes
 apps/files/js/dist/sidebar.js.map  | Bin 1509675 -> 1509781 bytes
 apps/files/src/services/Sidebar.js |   9 ---------
 apps/files/src/sidebar.js          |   1 +
 apps/files/src/views/Sidebar.vue   |  17 +++++++++++------
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
index dd052093cf5b92ffe29da75dee15c46b4a8f2bca..ab36d31cb7ad75bfa340184ea9c63b94bf12c0cc 100644
GIT binary patch
delta 1416
zcmZ`(TWl0n7|zVj3`<vA-QKoPN_Ux*89WT#t>v<1C<Q!V!lgH3j0n!op0-1`GwaOR
zF48uUM1np@Nk%+|*hCT^026E2n0cTH(RhIvlA_VHO^h+|Nn(i6)F)H_L6G?1%YV-Q
z{rAf`*X|@{?j%0G(#&E1YV!x2Tsg9C2gl*cn=NnE^0Malt*ftW&MfmFzw~88CEMAv
z3a*no4+6clvo9eNg&?X<xP+EmyA=bg>bj2ojGp0SpXeI+d|UsX17@_l379k8YwCb`
zf1m~Eje+j~x-htqkTBKLNcO$47XZIK_C>u+yIs9R6<5uAp-bA<rno*w68;T)CL?RZ
zgbo_RhmA4f6%CUpR7E9S)-11|c*Gqid5{9wZIg0q4^iaGIp^glM7vjRRt0%#s*By3
ziX<u<FIBCIU|aWRKWvEY*mAO9*`p~W+bpRFb-s0ZH<(<#{Bs<#n!eryWnZ~|7w*xy
z=JkgM6l|kD8=|OLqIrb&Q0iK_5+$LiGCx;}39_qDKRH_KAH9j!U{`-J^*qUqS~P`H
zhn!PD$Gp@_Q25-<i#&E&-)CYi^uKUxQw_vo3tNDGweStli;LTVe!IBoag6q;S;tar
z<RR==Ey*#gs;GZ*vUhS4S9UBN>*VC%-5TzVqtVWebjS7~(+HFT_vvCI)_XOV6boU$
zQe_BU-jGs}{0`=aILwAI?}FtL=6Tow_QQVu46x<_ema!?{t=(#WL7`R!-SYK%b((K
z@XIWZb0AE|BWpqT5F8PJt@?<`gVycFNH4%GiOBk8(Arfk^Z@!=wQx$nuqmvsMrdH?
zM}*bEx*CDgc&xBjeiZB2bO`CX@E+_<u(V64d;(6-{UOYRd7))t;K|T@N=3<bRqYx#
z+*Ua_zbw?Pipgl)vGT3$D4F)>3-!V0e+jv|T1@mKxf8^sn&}dQ5+oCLuSIHPy>Su6
zFi{`wZ*Vp)Uaf|pnWPw8jBd-3?M6p?n*DZN9DKyh&WR1ooD=u`3k3ju-NTM^(%#@F
zPRa|yUj4YjrtXSzFeXWj0^7$)O~Fi+l;C2>DH1!Y3_jGTw$+KS23Myeme<9KlGMv;
zR>Ww{fR!gX!_|hY0?}>6;wvKJwz2LNvA(JU5zQtislJsRTM-+$t*o>np5|Qk=ZdJt
zT}^h$kf(Y7cxY>b)#9a=3%$~6ZCh6kx-i;h8Xjp)XR>s}b;_+oE4pM{PiMd{ZP$rr
z8q^$7Ixd`+yaWng(KD{=xJoEhAJ{@FRnkVG1En*}s**aNHVckNvO^`?q?ThV>O@$P
z_Mb9RDRdun;hEBX1~u5Vm~@RZgW<;{O?cGNnJ1*((Ev9|8{qc|POOz)kHB1DYQIJh
zR#K)jR&;D)Q&`{wIsgSSY?!YC_gu)?@Gro9zm9|G25GYZPj)`p%-SyVahBgG-P#&9
z+}5Ei#nSR*$S4)42HhlfUU^nkm5I<nHuWI$e#fDyDYeUHMMY{nh{~3ocgot4y*(O+
b(LAa!oUCqZ;qm`U_nQP-_fK|Kk)HY+MQX}E

delta 1402
zcmZWpZ*0_L7*Bg`@3vDW+wJZcW82j_T6ih+aKzmxV}b<|f&DYaz>r?|Zj{~H+4eTr
z?Gi~O>IWG~)t3-SB+&$B;u%iU#LW<me;|kfjRt0nU;LtcFh;X)qEB_m2fsXhf4}Gd
z)8~E9-ArG)nSSqLGbQ+Q&2Ld!b^n@9iV~_Xx4hCoYqH<Brm?yqyF`Qj{O8GPuA?Uk
z$C<59g1ox5FRft_BTp(h*eg0#n*dN!RaNk_YL?P`tjZAcRrNaxz*zSx04KYf5&+&D
zXaRY7;9H<x8@!d~1W#3v=DXw10Dpb_vqsJ9cGRLLI#SLJLwfD)qT^FI?O(ReWi@#e
zdxQGuK7Aa!6S{##PeMgilTEiDyV#k;!=MGS+rm?AJy_JLr|iQq$oA`0v&3lSau>N-
zj-;z=&(}sHf~ESEcarhWjmHY6HO3>&A{miM_~wP};4*jNr+TPrc77GKeR2K{oMQ{k
zt@{Q<!9sl&WRY@McCpvvd5)PcdN@>7Z!8q!jOK`*pBZcL4_?ul1V=r<KaKNarpF_G
zuRRTN+~tR$@r5gAX~7|VpRf%u|H9REb&!kP+6eNCTVI1bd;2kv-`rmJpnx8ia<(a2
z$VGx*yC}p3NkaWIGrco2LbY@8PzR+2XX>bz4#u{OY*sq+Te5*zpgz8x64YMV!4rjW
zUi=g!pL&>=koLMpk5B>`)o2Gi7d4uO9UwpKqE7-ecGI(=_V;(`45g9A3JrgV*cE!3
z5`teUw3Y{@QXg3jwtL|d0orVg7&KU2PepoxZb?U4m%wV<3Z@6x=T|V(i~yTL`s$b@
zIemnw3D(pxluQdEdG1FxL1sfrRhc(nZ-T{bO!Wf@dg>46Tv!)cVg^=*?qvyOHc3*~
zr0%q7!RaL?5shnT(l&?NHld8--zYQ&pZ>|@6Ac1Z_vepd!;=jM>mEiLCh}KoiuBgA
zC@x^>-u?zJ*0XafAZa$k24`cB8cKe1r=pYJ=GnpfsItH&iLt=${ErHNy4Dk)(mmry
zt~6p6Flmi&>uZoBmBR8&awWzcBDorFZCgiI9*P(%FXzPago7v5EW)ydk9lebIZ?wU
zsSa|chC4x-q^XvZ>P=a2@Q5qB<}l9dPJ6paHvGl5DEFL{<)B@L?&3B@fpz>RsuEgw
zn^Y_tVQFHP%++#kY}u@Xtd4SP<5{FALqjl5Ng^wUptZwMZWTFpmwjTZZS5%7F3yb<
zEyFWyOO#695z~bwf^FZad%7s0{X2SO4LWw^fq$!$jnGF7KD^70GR&a*tVqgtSRvRG
z;Zh7K#kr<nI?AOe@@1T>L?A^l^8hC^_lJ4uA#Qt&u_v%aPQ1+|TK0)yQgl>0aCArx
zhpXap8I{KH@f>dyNMFDt6aTm2`QYa?hv4lBlB>BFBCvVz&(oxGo~aE!YT>R$kRbAg
zJw9Pu*z({a>{fv&;8EQ;4(O>6S@6EVd6y~#@AKRS2Cn{%Of$LL&VBz#__CPtFdos1
n1y3x6ra69j2K}}TSKNUPS|{mL6pMSLa#<pEB9|hL$gTeyFKWT6

diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
index 5136e611fb57de5a6d0ca0cae26b657e032af255..1f5016f792a310b423a8e46081dffadc9c7ee8c6 100644
GIT binary patch
delta 2406
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

delta 2191
zcmZuyZ){Ul6i>&1yD{b%+nfB^c>KxOpSQJLOSg6#aQgaMy0Ue(8)e!kUH7(j>%aBS
z+HFxjNCF>-F)ncZm&hkUOvn_IYNDTvF);}9iy`U<P>di-V&Vt+0-k$c=OFRJx%ZxP
z@A;kIIrpCT&MgH$d?UCV70btsUE!tMI{E6d*kmXV8O+wDl;2o>z-%%tfv)lDKHtw}
z<tD4qh~`~aTSqQk-k40tv1CSFy8h_es}~=izW7*&Qiie)r5t5F%7)^_#~U9QHd&5>
zq(HYF$Ku-ta!q&G3kpbs-~=fzv!#bEdz|0`X~qsRNKrcsfMk$i5Tq$P41wfj%docc
z(PcB)8;Bv|i~}+_863<j?|?a`xWIywAG{z1V7Rn$u@i9~&IiZXPJqWjYnPpo7=;OD
z4bwASq@}IE5%M^4$0VnfIl>O&dX$~aqN^V=^oK4I-PrA5iiHlCNW0aFr~J@^<7!kt
zNGcSxg!4GLxH9De11bn;#K{j`^ooh--Bwh*fN4k>Cu8021`{e%4rs^8!fiPRM2>*u
zgBctVAcj-M1+zF|!O}PdkXo~uwAQEGOqs=TR%UQhvJxAk&m17X?UoS$e9Qx;><+vo
za4S*>AjEC}qIM_UVIkYAT@n@<3yl=PZ>6$@^i;S@UV3`ULh>UXObG^&Hh8TDCqr^+
zKr(=wh}tDLVn<Cbw&N)joLrw9z*m4?><rc)#@a31)gz6ea+G?z$wyU#YdAx+s)sCY
z@v`jz3+Uyp!}QG_^6-$4Sv(Apo0aEyK7Py{0uD}Z+Nd#`*BH7-Ikc1e>FJ7<)Kw-m
zitb2?KCqH@`;$isc_(8zitiP?c~n@vQf3#^Jv@xL<Q>rJ%Cb04U$BvWU4p)4BPQJ}
z{nkbrbuoJ1MxZV}?_zWraXDpYaFC#fd&x*$Cc_vj$FZP}S#8HkFZGh%iX_J4ap@nu
zWRGMpmQ;;~UY6qQsuXt24YJ;W<G>Jywo+Rk*{L(rKp)vHm<pUX>q8hT5gD}7*ZN3v
zMO2I7nWkU#kv%7K7z42i@*39vdQYdcQp_j$`G{Teu-+OQNTpeg<pEA(E{=B0R0|we
zcr_0oaktcC2Y*7#_K8yh@+%!fKy2Z-eK>7((0%=6|Fbcrz@Mep>SjR0l8=SVJ7~C{
zbk$8eA)1jT1usX%0^>^<Gtv+GiBXrQKlYP-y2AN`<V^J}-h%?lBrj~bh_+q2dVKEK
z9Dd9huyt51<+PceJw*1_53cUv!&MYKrWoaJT6UNmKRJa}!t06JV+I#*mzik=TOU*m
zE-%Q@)$K%S+o0lC4Z?WOvQ?hf-lw{Nh2(EJ%-%&FHH1`C5hw49S)5(qImVf#Qv6N2
zu@MxbeW7=b7k3ar<)Ng?`q9T|KprV0q|7Xs4&o^@IR)=PIl6$|!20&|DIh2nD3vIi
zil?Be<{>eMjpO+B4;A0FZI*PzGHEhe$1Po_S9&+2RHHnDQiHMur50r?N*zjlaiv#y
zvGqR$iU`|^UR8+cp0?4SCWSxOOy5ljBWqemL^$!3wyk(2BK$SH4u3+$3!e$k*V9X%
z*H$_6p=>x}6BmPtU^bZ5>&0AZB9v9dY(y0^(Ft`tlortt()L4{`9xTpjK<WKa4wye
z#8g_HYZVvi%{xL9J#kyuP{r(GbF;|iV*0jly^MbKy--76U#TVM-``SBA6*yjZ7Tf=
zTULFy2eV!oI-Q7|>GW%HJHza6*;2fDL+Grb%YC)$>6af14aK@&g@$!&xtZ<?U$1Gb
zSaiod;g`zQ8wl>9-&_{D>8($M6ZE~`g$OSJxi6gCOn2N8_S4)$!AM`aB{Xdn+w?5Y
zWJ*o6q(a#UW4HLXu&s_MZ0BVhaMHK61rzk_9br3j7OT0J#<t|Lt9bSwp}dBEN*Zb_
zb81VezVyO7)jJ#Ka;iSg>fRAf##70Jn#gvrnsy{Yah2X64NZ-~Y+6lBsA-!R5&I8{
Xk(N?Tjz!gcE4@n^I_WDF4GsSSogt*w

diff --git a/apps/files/src/services/Sidebar.js b/apps/files/src/services/Sidebar.js
index 917302df610..42243b9de82 100644
--- a/apps/files/src/services/Sidebar.js
+++ b/apps/files/src/services/Sidebar.js
@@ -75,15 +75,6 @@ export default class Sidebar {
 		return false
 	}
 
-	/**
-	 * Close the sidebar
-	 *
-	 * @memberof Sidebar
-	 */
-	close() {
-		this.#state.file = ''
-	}
-
 	/**
 	 * Return current opened file
 	 *
diff --git a/apps/files/src/sidebar.js b/apps/files/src/sidebar.js
index f0f6fef6b9c..258f2313657 100644
--- a/apps/files/src/sidebar.js
+++ b/apps/files/src/sidebar.js
@@ -57,4 +57,5 @@ window.addEventListener('DOMContentLoaded', () => {
 	})
 	AppSidebar.$mount('#app-sidebar')
 	window.OCA.Files.Sidebar.open = AppSidebar.open
+	window.OCA.Files.Sidebar.close = AppSidebar.close
 })
diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue
index 4bc56075970..5f07138ea80 100644
--- a/apps/files/src/views/Sidebar.vue
+++ b/apps/files/src/views/Sidebar.vue
@@ -26,7 +26,7 @@
 		ref="sidebar"
 		v-bind="appSidebar"
 		:force-menu="true"
-		@close="onClose"
+		@close="close"
 		@update:active="setActiveTab"
 		@update:starred="toggleStarred"
 		@[defaultActionListener].stop.prevent="onDefaultAction">
@@ -250,10 +250,6 @@ export default {
 		canDisplay(tab) {
 			return tab.isEnabled(this.fileInfo)
 		},
-		onClose() {
-			this.resetData()
-			OCA.Files.Sidebar.close()
-		},
 		resetData() {
 			this.error = null
 			this.fileInfo = null
@@ -381,8 +377,9 @@ export default {
 		/**
 		 * Open the sidebar for the given file
 		 *
-		 * @memberof Sidebar
 		 * @param {string} path the file path to load
+		 * @returns {Promise}
+		 * @throws {Error} loading failure
 		 */
 		async open(path) {
 			// update current opened file
@@ -415,6 +412,14 @@ export default {
 				}
 			}
 		},
+
+		/**
+		 * Close the sidebar
+		 */
+		close() {
+			this.Sidebar.file = ''
+			this.resetData()
+		},
 	},
 }
 </script>
-- 
GitLab