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

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-12 14:51:34 -05:00
parent 242064d6f5
commit 5cef9b0cab
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dashboard-ui/scripts/librarybrowser.js
View file

@ -1712,6 +1712,8 @@
var dateText; var dateText;
var allowImageStretching = !(Dashboard.lastSystemInfo && Dashboard.lastSystemInfo.ImageEnhancers && Dashboard.lastSystemInfo.ImageEnhancers.length);
for (var i = 0, length = items.length; i < length; i++) { for (var i = 0, length = items.length; i < length; i++) {
var item = items[i]; var item = items[i];
@ -1748,13 +1750,13 @@
} }
} }
html += LibraryBrowser.getPosterViewItemHtml(item, i, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth); html += LibraryBrowser.getPosterViewItemHtml(item, i, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth, allowImageStretching);
} }
return html; return html;
}, },
getPosterViewItemHtml: function (item, index, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth) { getPosterViewItemHtml: function (item, index, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth, allowImageStretching) {
var html = ''; var html = '';
var imgUrl = null; var imgUrl = null;
@ -2013,6 +2015,11 @@
if (icon) { if (icon) {
imageCssClass += " iconCardImage"; imageCssClass += " iconCardImage";
} }
if (coverImage && !options.coverImage && !allowImageStretching) {
coverImage = false;
}
if (coverImage) { if (coverImage) {
imageCssClass += " coveredCardImage"; imageCssClass += " coveredCardImage";
} }