wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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
dashboard-ui/scripts/librarybrowser.js
+9 -2
View File
@@ -1712,6 +1712,8 @@
var dateText;
var allowImageStretching = !(Dashboard.lastSystemInfo && Dashboard.lastSystemInfo.ImageEnhancers && Dashboard.lastSystemInfo.ImageEnhancers.length);
for (var i = 0, length = items.length; i < length; 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;
},
getPosterViewItemHtml: function (item, index, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth) {
getPosterViewItemHtml: function (item, index, options, primaryImageAspectRatio, thumbWidth, posterWidth, squareSize, bannerWidth, allowImageStretching) {
var html = '';
var imgUrl = null;
@@ -2013,6 +2015,11 @@
if (icon) {
imageCssClass += " iconCardImage";
}
if (coverImage && !options.coverImage && !allowImageStretching) {
coverImage = false;
}
if (coverImage) {
imageCssClass += " coveredCardImage";
}