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 recording titles

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-16 21:21:22 -04:00
parent 507530feda
commit d11ee8a5dd
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -752,6 +752,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return html; return html;
} }
function isUsingLiveTvNaming(item) {
return item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'Recording';
}
var uniqueFooterIndex = 0; var uniqueFooterIndex = 0;
function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter, cardFooterId, vibrantSwatch) { function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter, cardFooterId, vibrantSwatch) {
@ -787,7 +791,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
else { else {
if (item.Type === 'Program') { if (isUsingLiveTvNaming(item)) {
lines.push(item.Name); lines.push(item.Name);
@ -826,7 +830,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
item.AlbumArtists[0].IsFolder = true; item.AlbumArtists[0].IsFolder = true;
lines.push(getTextActionButton(item.AlbumArtists[0])); lines.push(getTextActionButton(item.AlbumArtists[0]));
} else { } else {
lines.push(item.Type === 'Program' ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")); lines.push(isUsingLiveTvNaming(item) ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""));
} }
} }
@ -1343,7 +1347,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
if (!imgUrl) { if (!imgUrl) {
var defaultName = item.Type === 'Program' || item.Type === 'Timer' || item.EpisodeTitle ? item.Name : itemHelper.getDisplayName(item); var defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item);
cardImageContainerOpen += '<div class="cardText cardDefaultText">' + defaultName + '</div>'; cardImageContainerOpen += '<div class="cardText cardDefaultText">' + defaultName + '</div>';
} }

2
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js vendored
View file

@ -34,7 +34,7 @@
if (item.ChannelName || item.ChannelNumber) { if (item.ChannelName || item.ChannelNumber) {
context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#ChannelNameOnly', item.ChannelName || item.ChannelNumber); context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#ChannelNameOnly', item.ChannelName || item.ChannelNumber);
} else { } else {
context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#AllChannels'); context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#OneChannel');
} }
context.querySelector('.optionAroundTime').innerHTML = globalize.translate('sharedcomponents#AroundTime', datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate))); context.querySelector('.optionAroundTime').innerHTML = globalize.translate('sharedcomponents#AroundTime', datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate)));