summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-29 16:33:28 +0100
committerGitHub <noreply@github.com>2018-11-29 16:33:28 +0100
commit44aa1b0b900c1fc0125e474ef539b5eabe2d0f75 (patch)
treeec56925ff25630d4d481737f3473a0f34c6dfbec
parent9f64149a38f1cd5f3942dd19720e335911d04f46 (diff)
parentc2f4297e49f17922a54ebc2d9ffdb7df9d641fb6 (diff)
downloadnextcloud-server-44aa1b0b900c1fc0125e474ef539b5eabe2d0f75.tar.gz
nextcloud-server-44aa1b0b900c1fc0125e474ef539b5eabe2d0f75.zip
Merge pull request #12630 from nextcloud/bugfix/noid/versions
Fix versions sidebar issues
-rw-r--r--apps/files_versions/js/versionstabview.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 213ee1ae83c..12b493beec0 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -150,11 +150,18 @@
_formatItem: function(version) {
var timestamp = version.get('timestamp') * 1000;
var size = version.has('size') ? version.get('size') : 0;
+ var preview = OC.MimeType.getIconUrl(version.get('mimetype'));
+ var img = new Image();
+ img.onload = function () {
+ $('li[data-revision=' + version.get('timestamp') + '] .preview').attr('src', version.getPreviewUrl());
+ };
+ img.src = version.getPreviewUrl();
return _.extend({
versionId: version.get('id'),
formattedTimestamp: OC.Util.formatDate(timestamp),
relativeTimestamp: OC.Util.relativeModifiedDate(timestamp),
+ millisecondsTimestamp: timestamp,
humanReadableSize: OC.Util.humanFileSize(size, true),
altSize: n('files', '%n byte', '%n bytes', size),
hasDetails: version.has('size'),
@@ -162,7 +169,7 @@
downloadIconUrl: OC.imagePath('core', 'actions/download'),
downloadName: version.get('name'),
revertIconUrl: OC.imagePath('core', 'actions/history'),
- previewUrl: version.getPreviewUrl(),
+ previewUrl: preview,
revertLabel: t('files_versions', 'Restore'),
canRevert: (this.collection.getFileInfo().get('permissions') & OC.PERMISSION_UPDATE) !== 0
}, version.attributes);