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

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-21 15:27:07 -05:00
parent e0479fc18d
commit 60f00b55e9
6 changed files with 61 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ define(['apphost'], function (appHost) {
item = item.ProgramInfo || item;
}
var name = ((item.Type === 'Program' || item.Type === 'Recording') && item.IsSeries ? item.EpisodeTitle : item.Name) || '';
var name = ((item.Type === 'Program' || item.Type === 'Recording') && (item.IsSeries || item.EpisodeTitle) ? item.EpisodeTitle : item.Name) || '';
if (item.Type === "TvChannel") {

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

@ -225,7 +225,7 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', '
});
}
if (item.IsSeries && item.EpisodeTitle && options.episodeTitle !== false) {
if ((item.IsSeries || item.EpisodeTitle) && options.episodeTitle !== false) {
miscInfo.push(itemHelper.getDisplayName(item));
}

4
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -1780,7 +1780,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
var contentType;
var transcodingOffsetTicks = 0;
var playerStartPositionTicks = startPosition;
var liveStreamId;
var liveStreamId = mediaSource.LiveStreamId;
var playMethod = 'Transcode';
@ -1813,7 +1813,6 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
if (mediaSource.LiveStreamId) {
directOptions.LiveStreamId = mediaSource.LiveStreamId;
liveStreamId = mediaSource.LiveStreamId;
}
mediaUrl = apiClient.getUrl('Videos/' + item.Id + '/stream.' + mediaSourceContainer, directOptions);
@ -1868,7 +1867,6 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
if (mediaSource.LiveStreamId) {
directOptions.LiveStreamId = mediaSource.LiveStreamId;
liveStreamId = mediaSource.LiveStreamId;
}
mediaUrl = apiClient.getUrl('Audio/' + item.Id + '/stream.' + mediaSourceContainer, directOptions);