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

Merge pull request #4361 from bugfixin/master

Browse source
This commit is contained in:
Bill Thornton 2024-05-08 21:37:25 -04:00 • committed by GitHub
commit 2c4ff2a5ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/components/cardbuilder/cardBuilder.js
View file

@ -4,6 +4,7 @@
* @module components/cardBuilder/cardBuilder * @module components/cardBuilder/cardBuilder
*/ */
import { PersonKind } from '@jellyfin/sdk/lib/generated-client/models/person-kind';
import escapeHtml from 'escape-html'; import escapeHtml from 'escape-html';
import browser from 'scripts/browser'; import browser from 'scripts/browser';
@ -698,8 +699,26 @@ function getCardFooterText(item, apiClient, options, footerClass, progressHtml,
} }
} }
if (options.showPersonRoleOrType && item.Role) { if (options.showPersonRoleOrType && item.Type) {
if (item.Role) {
if ([ PersonKind.Actor, PersonKind.GuestStar ].includes(item.Type)) {
// List actor roles formatted like "as Character Name"
lines.push(globalize.translate('PersonRole', escapeHtml(item.Role))); lines.push(globalize.translate('PersonRole', escapeHtml(item.Role)));
} else if (item.Role.toLowerCase() === item.Type.toLowerCase()) {
// Role and Type are the same so use the localized Type
lines.push(escapeHtml(globalize.translate(item.Type)));
} else if (item.Role.toLowerCase().includes(item.Type.toLowerCase())) {
// Avoid duplication if the Role includes the Type (i.e. Executive Producer)
lines.push(escapeHtml(item.Role));
} else {
// Type and Role are unique so list both (i.e. Writer | Novel)
lines.push(escapeHtml(globalize.translate(item.Type)));
lines.push(escapeHtml(item.Role));
}
} else {
// No Role so use the localized Type
lines.push(escapeHtml(globalize.translate(item.Type)));
}
} }
} }

25
src/controllers/itemDetails/index.js
View file

@ -1,3 +1,4 @@
import { PersonKind } from '@jellyfin/sdk/lib/generated-client/models/person-kind';
import { intervalToDuration } from 'date-fns'; import { intervalToDuration } from 'date-fns';
import DOMPurify from 'dompurify'; import DOMPurify from 'dompurify';
import escapeHtml from 'escape-html'; import escapeHtml from 'escape-html';
@ -822,8 +823,18 @@ function setInitialCollapsibleState(page, item, apiClient, context, user) {
page.querySelector('#specialsCollapsible').classList.add('hide'); page.querySelector('#specialsCollapsible').classList.add('hide');
} }
renderCast(page, item); const cast = [];
renderGuestCast(page, item); const guestCast = [];
(item.People || []).forEach(p => {
if (p.Type === PersonKind.GuestStar) {
guestCast.push(p);
} else {
cast.push(p);
}
});
renderCast(page, item, cast);
renderGuestCast(page, item, guestCast);
if (item.PartCount && item.PartCount > 1) { if (item.PartCount && item.PartCount > 1) {
page.querySelector('#additionalPartsCollapsible').classList.remove('hide'); page.querySelector('#additionalPartsCollapsible').classList.remove('hide');
@ -1803,11 +1814,7 @@ function renderSpecials(page, item, user) {
}); });
} }
function renderCast(page, item) { function renderCast(page, item, people) {
const people = (item.People || []).filter(function (p) {
return p.Type === 'Actor';
});
if (!people.length) { if (!people.length) {
page.querySelector('#castCollapsible').classList.add('hide'); page.querySelector('#castCollapsible').classList.add('hide');
return; return;
@ -1827,9 +1834,7 @@ function renderCast(page, item) {
}); });
} }
function renderGuestCast(page, item) { function renderGuestCast(page, item, people) {
const people = (item.People || []).filter(p => p.Type === 'GuestStar');
if (!people.length) { if (!people.length) {
page.querySelector('#guestCastCollapsible').classList.add('hide'); page.querySelector('#guestCastCollapsible').classList.add('hide');
return; return;