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

update lists

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-03 02:28:45 -04:00
parent 6f73ce4cc3
commit c2290dd41d
33 changed files with 540 additions and 627 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -761,6 +761,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var lines = [];
var parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo';
var titleAdded;
if (showOtherText) {
if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
@ -776,20 +777,30 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
else {
var parentTitle = item.Type === 'Program' ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "");
if (item.Type === 'Program') {
if (parentTitle || options.showParentTitle) {
lines.push(parentTitle);
lines.push(item.Name);
if (!item.IsSeries) {
titleAdded = true;
}
} else {
var parentTitle = item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "";
if (parentTitle || options.showParentTitle) {
lines.push(parentTitle);
}
}
}
}
}
if (showTitle || forceName || (options.showParentTitleOrTitle && !lines.length)) {
if (((showTitle || forceName) && !titleAdded) || (options.showParentTitleOrTitle && !lines.length)) {
var name = options.showTitle === 'auto' && !item.IsFolder && item.MediaType === 'Photo' ? '' : itemHelper.getDisplayName(item);
lines.push(htmlEncode(name));
lines.push(name);
}
if (showOtherText) {