From c1277ea2fa8ed86eaebfdfaf599cf8d5d79c2e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Wed, 4 Dec 2019 09:44:35 +0100
Subject: [PATCH] Use own getIconUrl method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
apps/files/js/dist/sidebar.js | Bin 366068 -> 366675 bytes
apps/files/js/dist/sidebar.js.map | Bin 1382596 -> 1384122 bytes
apps/files/src/views/Sidebar.vue | 33 +++++++++++++++++++++++++++++-
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
index b446496096f256c4f62c019b8667349361077376..c1704dab68058548ac36cc2127ce29cf26fe54f9 100644
GIT binary patch
delta 706
zcmeyeTI})$v4$;-OG`OSO^s5LQ!R|z*OoE@F%u9oZ(m!=vS&SqK~k!bskx!q_Ci(G
zJU6+LjLc%a^wbj1<ovwQq8yD>%~~A<ck;tN(fZuX+|-iFg4CKCrNn}QoXq6JlFa-(
z{ru#T)Dqp|lA_eaTqWzG)RNMoJf)11l7bZd(!9(H-IUCt)Z~)<qDm!OTiX(QrQ(dl
zqSO=+Csi*uzcjBT1Y#ycT(>AczXVOv-rrfzH?uxB6{Hf`kxD?bb)n{IS}CPgl%y8r
zCFbBZ1BVeXjY^tUW%-#Y3I>WOj#E=pQc|?7M|Lm7NjQvC(nj)`rd6sQ*oh#=7ptjh
zAanIH^HNeP{L?gmJ`4thi(asYV~}fnNMwL(ypN}!x2B!0VNDHKOMMa8|HXLqxcWMJ
z`hYZP;&ov`X%aC0fZj!RjG7uUPcJ7mFTEtg&H!!@{?G@<5%vH9+Ji&3WIJ;Xs~;yK
LF-DfM&Q<^b?|Jz)
delta 93
zcmcb-LF~(Fv4$;-OG`Nn(k#-<%@R%8*OoE@F%u9oZ(m!=vS&SqiJ?hys-Z#h_Ci(G
nJh$lrX{_SB@#(20p2_)np+z|wsoRtCSp7H=>UNZ~&Q<^bdRrkZ
diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
index 44dbfd7e00a2cabf70f4df02e5621b87f49c1843..2f40bb02061fa4fa66bbfb46b48e405e657b4815 100644
GIT binary patch
delta 1778
zcmah}UuauZ7^iEur1r1NZE>(}XHJ@CO_SXGY13h4r%Bq>bw*9rFpZ3x+>`Wn_fK~3
zNm+GJhL*kxK@KPg;)AbK9|D3RBKn{Y9i<OGY%ju|lp*-m2mQ`TlT7F$<oBKPefRhM
zzCSm~k6-4#`8IdI<m-#aqiS6~nW$Hn2iV)+4-9?%gYRPqN0fM7&Y!PuXHWN$s4CYV
z^h_}8hBV5`1!?&6y=-r9F%|*}s{3>9_Yc>057&ACCjh;GKEO%9sm9@&>&n>nRqU@U
z;@BegXK@tlGEQK>waBfL#wl^Xj{SKoLnMnsU<GA1!6{loP?G$9TSVd_H7f46gbfQz
zIK>b|E6J0Z^cOAh6dVXaF4*uQUdDa}Z@@i^wG`8J*QLw)68CO_73GZt&SHNF$3!?P
z!u+l+<2W2Jz&sq#!1NN^(_MjAb<oV<I9O+iw=%tggWyz>*hpjltccZ;xC+i27$)Zu
z6ppPV-hu;m^e!BE97?ma;ktN&=64Ol1#koU0nY&j8iq0W-MBkcB;nYcJj<-Nq%)1x
z4+cFw?pQ3WmPkCjTiF=|3;~7#BY;uB^MKP|RCYWE?d%3*@AR}?A;!iE(pUX0{dd^C
zkY}8Q0-jTiKMK;hP3GR0eq~pFlHBaczI1_o_=_|+n6RoEQBm2p48(@3LlfH$u{Vhw
zEb3M<D9@5mJU&NCvys@mEXxr>BIW2DL`yL_JWs+QIUXvhB&bxYPOz-$#0hRRFS_Q?
zz=m^iRgTQf70d!HP;?39GRe$klqX2h9SfNRO4D`CK?;13LlsjUQgq8CNY{$CVsEjB
z2hth#@~1BM7*}60%N8UM#2pPBc5hGeeDvp#J9gdH5p6!yN|uSrmW>R}Ai1q7X_XH)
zFBL*pfC3o|-<PD!rqZFJ1)<Fg1$a7zbaeMF^1_6=R#K>DnL(>W37v7MO%%i1)GSb~
zjHX0E_S+}YxosbMul1xrgF#et2vSK|sp%AY(^X<4-e-ry^IJ0p469~R-a1-XSU_H9
zU9pMk<&AWw%-EJiy-=I|{dmOlQYI0&cC>>)XX+`hs@XF~nm%?rGCVf<ELn1g65CYt
zrZD^K@yPgOH`Ny3+tgh+M)v|tR5M{0nhCFea`L#5ILGT1<s#k6dC~MS>CM{P?b>2g
zzD<Xho9gVmK#$=BG-&QlraT3OvwZP^Y#P6rx|zH2dg|ut%4=7B=oK_0KdtigdubPo
zI$f1g*YL_}Q_9!T5+iqgZ`E26zKBQrjUChfe^%P=#tG=etk8AnJ@o%YM4Adk9)w5E
yPIP$#K>4gZ`oj5VP+Gsh#y|VgSbyj5>g+@5=Z?q!30dDG>GyW1@#K+oF#j)2=2bcX
delta 558
zcmdnBH{{61kPXS2ENLdDX_F0EohKK#b5B2gfSY&oA<bEuEG9`w$&(Gk<tNt%3$YlP
znx#&@$S6Dgex!)N^lLF9e2XsxGczX|B?6TwOx6kEX#O46{yU5jh?#(x8Hibcm=%cG
zw*L-ecMvu7bks?Aax`{w)CqPp0+Q~I&W<|yP9U<_!_n1Ir_|Ze-BBmeF$X9T?3nF5
z{Z0<MmQ|h$h?ff_!5VU%9fKWpk{!*#!e(G$5IfV|Q5#4B&C>@`+0KsXuG1ZI+4a2g
zfF}DpY6Hn)H;`T0o{kxAK&QAk<^w4+uvn>!V-b)O=vWFQfku=8sY(||10V%-vLTQP
zcQkUFz9W}inW-$a{cbKh5OV-AClGT1G57Ynxjg&CI7|#pl2Z*0lBYj>EF!smPYaJQ
zBZonnMVh%;qDlMpRvsYc1!6uR<_BT{AQl8-q2<?Gg|DLN{t+dT!-y(2y){N;6DQ1)
z*y$e)gvF*W&=Y3c9uq4fS2n%ovdF3Fk7kL8GsaK%z9OQso$Zzg3#SN7gIaNNenD!A
oZAnpS>huRIL}aF0Jr<ddV#OaWnBo|v>2g~{rf;u%Dq>>^0K{;?DgXcg
diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue
index 4b9e7b514ff..1758b510b17 100644
--- a/apps/files/src/views/Sidebar.vue
+++ b/apps/files/src/views/Sidebar.vue
@@ -274,11 +274,42 @@ export default {
}
})
},
+
getPreviewIfAny(fileInfo) {
if (fileInfo.hasPreview) {
return OC.generateUrl(`/core/preview?fileId=${fileInfo.id}&x=${screen.width}&y=${screen.height}&a=true`)
}
- return OCA.Files.App.fileList._getIconUrl(fileInfo)
+ return this.getIconUrl(fileInfo)
+ },
+
+ /**
+ * Copied from https://github.com/nextcloud/server/blob/16e0887ec63591113ee3f476e0c5129e20180cde/apps/files/js/filelist.js#L1377
+ * TODO: We also need this as a standalone library
+ *
+ * @param {Object} fileInfo the fileinfo
+ * @returns {string} Url to the icon for mimeType
+ */
+ getIconUrl(fileInfo) {
+ var mimeType = fileInfo.mimetype || 'application/octet-stream'
+ if (mimeType === 'httpd/unix-directory') {
+ // use default folder icon
+ if (fileInfo.mountType === 'shared' || fileInfo.mountType === 'shared-root') {
+ return OC.MimeType.getIconUrl('dir-shared')
+ } else if (fileInfo.mountType === 'external-root') {
+ return OC.MimeType.getIconUrl('dir-external')
+ } else if (fileInfo.mountType !== undefined && fileInfo.mountType !== '') {
+ return OC.MimeType.getIconUrl('dir-' + fileInfo.mountType)
+ } else if (fileInfo.shareTypes && (
+ fileInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_LINK) > -1
+ || fileInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_EMAIL) > -1)
+ ) {
+ return OC.MimeType.getIconUrl('dir-public')
+ } else if (fileInfo.shareTypes && fileInfo.shareTypes.length > 0) {
+ return OC.MimeType.getIconUrl('dir-shared')
+ }
+ return OC.MimeType.getIconUrl('dir')
+ }
+ return OC.MimeType.getIconUrl(mimeType)
},
tabComponent(tab) {
--
GitLab