Skip to content

Always show full previews #14876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Mar 27, 2019
Merged

Always show full previews #14876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/files/css/detailsView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@
}

#app-sidebar .thumbnail {
width: 75px;
height: 75px;
width: 100%;
min-height: 75px;
display: inline-block;
float: left;
margin-right: 10px;
background-size: 75px;
background-size: contain;
background-repeat: no-repeat;
}

#app-sidebar .ellipsis {
Expand Down
29 changes: 11 additions & 18 deletions apps/files/js/sidebarpreviewmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
var isImage = model.isImage();
var maxImageWidth = $thumbnailContainer.parent().width() + 50; // 50px for negative margins
var maxImageHeight = maxImageWidth / (16 / 9);
var smallPreviewSize = 75;

var isLandscape = function (img) {
return img.width > (img.height * 1.2);
Expand All @@ -71,15 +70,11 @@
};

var getTargetHeight = function (img) {
if (isImage) {
var targetHeight = img.height / window.devicePixelRatio;
if (targetHeight <= smallPreviewSize) {
targetHeight = smallPreviewSize;
}
return targetHeight;
} else {
return smallPreviewSize;
var targetHeight = img.height / window.devicePixelRatio;
if (targetHeight <= maxImageHeight) {
targetHeight = maxImageHeight;
}
return targetHeight;
};

var getTargetRatio = function (img) {
Expand All @@ -96,10 +91,10 @@
path: model.getFullPath(),
mime: model.get('mimetype'),
etag: model.get('etag'),
y: isImage ? maxImageHeight : smallPreviewSize,
x: isImage ? maxImageWidth : smallPreviewSize,
a: isImage ? 1 : null,
mode: isImage ? 'cover' : null,
y: maxImageHeight,
x: maxImageWidth,
a: 1,
mode: 'cover',
callback: function (previewUrl, img) {
$thumbnailDiv.previewImg = previewUrl;

Expand All @@ -109,16 +104,14 @@
}
$thumbnailDiv.removeClass('icon-loading icon-32');
var targetHeight = getTargetHeight(img);
if (isImage && targetHeight > smallPreviewSize) {
$thumbnailContainer.addClass((isLandscape(img) && !isSmall(img)) ? 'landscape' : 'portrait');
$thumbnailContainer.addClass('large');
}
$thumbnailContainer.addClass((isLandscape(img) && !isSmall(img)) ? 'landscape' : 'portrait');
$thumbnailContainer.addClass('large');

// only set background when we have an actual preview
// when we don't have a preview we show the mime icon in the error handler
$thumbnailDiv.css({
'background-image': 'url("' + previewUrl + '")',
height: (targetHeight > smallPreviewSize) ? 'auto' : targetHeight,
height: (targetHeight > maxImageHeight) ? 'auto' : targetHeight,
'max-height': isSmall(img) ? targetHeight : null
});

Expand Down