1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fix latest aspect ratio

This commit is contained in:
Luke Pulverenti 2016-01-21 16:30:59 -05:00
parent df5609a601
commit c8a02b2c0a

View file

@ -29,6 +29,20 @@
var pageSizeKey = 'pagesize_v4'; var pageSizeKey = 'pagesize_v4';
function getDesiredAspect(shape) {
switch (shape) {
case 'squareCard':
return 1;
case 'backdropCard':
return (16 / 9);
case 'portraitCard':
return (2 / 3);
}
return null;
}
var libraryBrowser = { var libraryBrowser = {
getDefaultPageSize: function (key, defaultValue) { getDefaultPageSize: function (key, defaultValue) {
@ -1791,6 +1805,7 @@
} }
var dateText; var dateText;
var uiAspect = getDesiredAspect(options.shape);
for (var i = 0, length = items.length; i < length; i++) { for (var i = 0, length = items.length; i < length; i++) {
@ -1828,13 +1843,13 @@
} }
} }
html += LibraryBrowser.getPosterViewItemHtml(item, i, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth); html += LibraryBrowser.getPosterViewItemHtml(item, i, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth, uiAspect);
} }
return html; return html;
}, },
getPosterViewItemHtml: function (item, index, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth) { getPosterViewItemHtml: function (item, index, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth, uiAspect) {
var html = ''; var html = '';
var imgUrl = null; var imgUrl = null;
@ -1867,8 +1882,11 @@
tag: item.ImageTags.Primary, tag: item.ImageTags.Primary,
enableImageEnhancers: enableImageEnhancers enableImageEnhancers: enableImageEnhancers
}); });
if (height != null) {
coverImage = true; if (primaryImageAspectRatio) {
if (uiAspect) {
coverImage = Math.abs(primaryImageAspectRatio - uiAspect) <= .2;
}
} }
} else if (options.autoThumb && item.ImageTags && item.ImageTags.Thumb) { } else if (options.autoThumb && item.ImageTags && item.ImageTags.Thumb) {
@ -1947,8 +1965,11 @@
tag: item.ImageTags.Primary, tag: item.ImageTags.Primary,
enableImageEnhancers: enableImageEnhancers enableImageEnhancers: enableImageEnhancers
}); });
if (height != null) {
coverImage = true; if (primaryImageAspectRatio) {
if (uiAspect) {
coverImage = Math.abs(primaryImageAspectRatio - uiAspect) <= .2;
}
} }
} }
else if (item.ParentPrimaryImageTag) { else if (item.ParentPrimaryImageTag) {
@ -1972,8 +1993,11 @@
tag: item.AlbumPrimaryImageTag, tag: item.AlbumPrimaryImageTag,
enableImageEnhancers: enableImageEnhancers enableImageEnhancers: enableImageEnhancers
}); });
if (width != null) {
coverImage = true; if (primaryImageAspectRatio) {
if (uiAspect) {
coverImage = Math.abs(primaryImageAspectRatio - uiAspect) <= .2;
}
} }
} }
else if (item.Type == 'Season' && item.ImageTags && item.ImageTags.Thumb) { else if (item.Type == 'Season' && item.ImageTags && item.ImageTags.Thumb) {