summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-05-06 18:32:52 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-05-06 18:32:52 +0200
commitb1713b2f75370d6c597c2a2a16ab51431802ade2 (patch)
tree743ae6d1c0ed5c5fe4e7823833bdcdb635a13a61 /apps
parent6633514a980b3246bdd4c26a1b890d12306f47f8 (diff)
downloadnextcloud-server-b1713b2f75370d6c597c2a2a16ab51431802ade2.tar.gz
nextcloud-server-b1713b2f75370d6c597c2a2a16ab51431802ade2.zip
Enable file icons & previews in "Shared ..." categories
* sharing API returns now the mimetype icon path * file previews are now lazyloaded by default (as the doc says) * fixes #16086
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/filelist.js3
-rw-r--r--apps/files_sharing/api/local.php1
-rw-r--r--apps/files_sharing/js/sharedfilelist.js1
3 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 0181acab596..e88ea1ad5d7 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -950,7 +950,8 @@
if (fileData.isPreviewAvailable) {
var iconDiv = filenameTd.find('.thumbnail');
// lazy load / newly inserted td ?
- if (options.animate) {
+ // the typeof check ensures that the default value of animate is true
+ if (typeof(options.animate) === 'undefined' || !!options.animate) {
this.lazyLoadPreview({
path: path + '/' + fileData.name,
mime: mime,
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index 00509bcee69..03812800c17 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -68,6 +68,7 @@ class Local {
if (\OC::$server->getPreviewManager()->isMimeSupported($share['mimetype'])) {
$share['isPreviewAvailable'] = true;
}
+ $share['icon'] = substr(\OC_Helper::mimetypeIcon($share['mimetype']), 0, -3) . 'svg';
}
}
return new \OC_OCS_Result($shares);
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 2c7d6c7d43a..ca187940a08 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -176,6 +176,7 @@
.map(function(share) {
var file = {
id: share.file_source,
+ icon: share.icon,
mimetype: share.mimetype
};
if (share.item_type === 'folder') {