summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2017-09-19 17:24:53 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2017-11-20 21:00:26 +0100
commit7bc28f14de8c3d77ec611a4ffd8ad48dc6093cea (patch)
tree1b48fa49cf6ad996c9da8ddfb2736fad99b421ac /apps/files/js
parent37d8d3d858d66ccfc9b9a32606a9448bc15f5960 (diff)
downloadnextcloud-server-7bc28f14de8c3d77ec611a4ffd8ad48dc6093cea.tar.gz
nextcloud-server-7bc28f14de8c3d77ec611a4ffd8ad48dc6093cea.zip
show e2e folder icon on encrypted folders
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 217a2f14896..0add41d6419 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1156,7 +1156,10 @@
if (type === 'dir') {
mime = mime || 'httpd/unix-directory';
- if (fileData.mountType && fileData.mountType.indexOf('external') === 0) {
+ if (fileData.isEncrypted) {
+ icon = OC.MimeType.getIconUrl('dir-encrypted');
+ dataIcon = icon;
+ } else if (fileData.mountType && fileData.mountType.indexOf('external') === 0) {
icon = OC.MimeType.getIconUrl('dir-external');
dataIcon = icon;
}