diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-09-15 21:11:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 21:11:38 +0200 |
| commit | 7149ed74c1f7aaa022d349f892c4727b614b8ec6 (patch) | |
| tree | b30ea4ff40ed69905ee01ba592d43604c1e010cf /core/js/share.js | |
| parent | 978d312e69d8ae27601ed8ac0cfe7dadc6669442 (diff) | |
| parent | d1724cb665bb3282f76967a3f92374bb652403de (diff) | |
| download | nextcloud-server-7149ed74c1f7aaa022d349f892c4727b614b8ec6.tar.gz nextcloud-server-7149ed74c1f7aaa022d349f892c4727b614b8ec6.zip | |
Merge pull request #16976 from nextcloud/bugfix/noid/directory-icon-mount
Always use the folder icon depending on the mount type if not a share mount
Diffstat (limited to 'core/js/share.js')
| -rw-r--r-- | core/js/share.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/js/share.js b/core/js/share.js index cef05eb6479..26b420ab477 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -269,22 +269,23 @@ OC.Share = _.extend(OC.Share || {}, { var message, recipients, avatars; var ownerId = $tr.attr('data-share-owner-id'); var owner = $tr.attr('data-share-owner'); + var mountType = $tr.attr('data-mounttype'); var shareFolderIcon; var iconClass = 'icon-shared'; action.removeClass('shared-style'); // update folder icon if (type === 'dir' && (hasShares || hasLink || ownerId)) { - if (hasLink) { + if (typeof mountType !== 'undefined' && mountType !== 'shared-root' && mountType !== 'shared') { + shareFolderIcon = OC.MimeType.getIconUrl('dir-' + mountType); + } else if (hasLink) { shareFolderIcon = OC.MimeType.getIconUrl('dir-public'); - } - else { + } else { shareFolderIcon = OC.MimeType.getIconUrl('dir-shared'); } $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')'); $tr.attr('data-icon', shareFolderIcon); } else if (type === 'dir') { var isEncrypted = $tr.attr('data-e2eencrypted'); - var mountType = $tr.attr('data-mounttype'); // FIXME: duplicate of FileList._createRow logic for external folder, // need to refactor the icon logic into a single code path eventually if (isEncrypted === 'true') { |