Fallback to directory icon based on the mount type
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
parent
a195c186e6
commit
260d93e5f2
|
@ -186,6 +186,9 @@
|
||||||
this._previewManager.loadPreview(this.model, $iconDiv, $container);
|
this._previewManager.loadPreview(this.model, $iconDiv, $container);
|
||||||
} else {
|
} else {
|
||||||
var iconUrl = this.model.get('icon') || OC.MimeType.getIconUrl('dir');
|
var iconUrl = this.model.get('icon') || OC.MimeType.getIconUrl('dir');
|
||||||
|
if (typeof this.model.get('mountType') !== 'undefined') {
|
||||||
|
iconUrl = OC.MimeType.getIconUrl('dir-' + this.model.get('mountType'))
|
||||||
|
}
|
||||||
$iconDiv.css('background-image', 'url("' + iconUrl + '")');
|
$iconDiv.css('background-image', 'url("' + iconUrl + '")');
|
||||||
}
|
}
|
||||||
this.$el.find('[title]').tooltip({placement: 'bottom'});
|
this.$el.find('[title]').tooltip({placement: 'bottom'});
|
||||||
|
|
|
@ -269,22 +269,23 @@ OC.Share = _.extend(OC.Share || {}, {
|
||||||
var message, recipients, avatars;
|
var message, recipients, avatars;
|
||||||
var ownerId = $tr.attr('data-share-owner-id');
|
var ownerId = $tr.attr('data-share-owner-id');
|
||||||
var owner = $tr.attr('data-share-owner');
|
var owner = $tr.attr('data-share-owner');
|
||||||
|
var mountType = $tr.attr('data-mounttype');
|
||||||
var shareFolderIcon;
|
var shareFolderIcon;
|
||||||
var iconClass = 'icon-shared';
|
var iconClass = 'icon-shared';
|
||||||
action.removeClass('shared-style');
|
action.removeClass('shared-style');
|
||||||
// update folder icon
|
// update folder icon
|
||||||
if (type === 'dir' && (hasShares || hasLink || ownerId)) {
|
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');
|
shareFolderIcon = OC.MimeType.getIconUrl('dir-public');
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
shareFolderIcon = OC.MimeType.getIconUrl('dir-shared');
|
shareFolderIcon = OC.MimeType.getIconUrl('dir-shared');
|
||||||
}
|
}
|
||||||
$tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')');
|
$tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')');
|
||||||
$tr.attr('data-icon', shareFolderIcon);
|
$tr.attr('data-icon', shareFolderIcon);
|
||||||
} else if (type === 'dir') {
|
} else if (type === 'dir') {
|
||||||
var isEncrypted = $tr.attr('data-e2eencrypted');
|
var isEncrypted = $tr.attr('data-e2eencrypted');
|
||||||
var mountType = $tr.attr('data-mounttype');
|
|
||||||
// FIXME: duplicate of FileList._createRow logic for external folder,
|
// FIXME: duplicate of FileList._createRow logic for external folder,
|
||||||
// need to refactor the icon logic into a single code path eventually
|
// need to refactor the icon logic into a single code path eventually
|
||||||
if (isEncrypted === 'true') {
|
if (isEncrypted === 'true') {
|
||||||
|
|
Loading…
Reference in New Issue