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

more support for episodes directly in a series folder

Browse source
This commit is contained in:
Luke Pulverenti 2013-12-03 23:18:50 -05:00
parent b8c8a794f3
commit e38caab270
15 changed files with 217 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -735,7 +735,7 @@
else if (item.ImageTags && item.ImageTags.Primary) {
height = 300;
width = primaryImageAspectRatio ? parseInt(height * primaryImageAspectRatio) : null;
width = primaryImageAspectRatio ? (height * primaryImageAspectRatio).toFixed(0) : null;
imgUrl = ApiClient.getImageUrl(item.Id, {
type: "Primary",
@ -748,7 +748,7 @@
else if (item.AlbumId && item.AlbumPrimaryImageTag) {
height = 300;
width = primaryImageAspectRatio ? parseInt(height * primaryImageAspectRatio) : null;
width = primaryImageAspectRatio ? (height * primaryImageAspectRatio).toFixed(0) : null;
imgUrl = ApiClient.getImageUrl(item.AlbumId, {
type: "Primary",
@ -1200,7 +1200,7 @@
}
else if (item.ParentIndexNumber && item.Type == "Episode") {
html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.ParentId + '">Season ' + item.ParentIndexNumber + '</a>');
html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeasonId + '">Season ' + item.ParentIndexNumber + '</a>');
}
else if (item.Album && item.Type == "Audio" && (item.AlbumId || item.ParentId)) {
html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + (item.AlbumId || item.ParentId) + '">' + item.Album + '</a>');
@ -2009,20 +2009,31 @@
}
}
var minutes;
if (item.RunTimeTicks && item.Type != "Series") {
if (item.Type == "Audio") {
miscInfo.push(Dashboard.getDisplayTime(item.RunTimeTicks));
} else {
var minutes = item.RunTimeTicks / 600000000;
minutes = item.RunTimeTicks / 600000000;
minutes = minutes || 1;
miscInfo.push(parseInt(minutes) + "min");
miscInfo.push(minutes.toFixed(0) + "min");
}
}
if (item.DurationMs) {
minutes = item.DurationMs / 60000;
minutes = minutes || 1;
miscInfo.push(minutes.toFixed(0) + "min");
}
if (item.OfficialRating && item.Type !== "Season" && item.Type !== "Episode") {
miscInfo.push(item.OfficialRating);
}