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

Restore sort order after jellyfin/jellyfin#7529, allow subtitle selector display whithout video stream

Browse source
This commit is contained in:
Shadowghost 2022-04-03 13:10:50 +02:00
parent 33b1f039ea
commit dc956eb48c
2 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/itemHelper.js
View file

@ -331,6 +331,17 @@ export function supportsMediaSourceSelection (item) {
return true; return true;
} }
export function sortTracks (trackA, trackB) {
let cmp = trackA.IsExternal - trackB.IsExternal;
if (cmp != 0) return cmp;
cmp = trackB.IsForced - trackA.IsForced;
if (cmp != 0) return cmp;
cmp = trackB.IsDefault - trackA.IsDefault;
if (cmp != 0) return cmp;
return trackA.Index - trackB.Index;
}
export default { export default {
getDisplayName: getDisplayName, getDisplayName: getDisplayName,
supportsAddingToCollection: supportsAddingToCollection, supportsAddingToCollection: supportsAddingToCollection,
@ -346,5 +357,6 @@ export default {
canRate: canRate, canRate: canRate,
canConvert: canConvert, canConvert: canConvert,
canRefreshMetadata: canRefreshMetadata, canRefreshMetadata: canRefreshMetadata,
supportsMediaSourceSelection: supportsMediaSourceSelection supportsMediaSourceSelection: supportsMediaSourceSelection,
sortTracks: sortTracks
}; };

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

@ -188,7 +188,7 @@ function renderTrackSelections(page, instance, item, forceReload) {
}); });
resolutionNames.sort((a, b) => parseInt(b.Name, 10) - parseInt(a.Name, 10)); resolutionNames.sort((a, b) => parseInt(b.Name, 10) - parseInt(a.Name, 10));
sourceNames.sort(function(a, b) { sourceNames.sort((a, b) => {
const nameA = a.Name.toUpperCase(); const nameA = a.Name.toUpperCase();
const nameB = b.Name.toUpperCase(); const nameB = b.Name.toUpperCase();
if (nameA < nameB) { if (nameA < nameB) {
@ -274,6 +274,7 @@ function renderAudioSelections(page, mediaSources) {
const tracks = mediaSource.MediaStreams.filter(function (m) { const tracks = mediaSource.MediaStreams.filter(function (m) {
return m.Type === 'Audio'; return m.Type === 'Audio';
}); });
tracks.sort((a, b) => itemHelper.sortTracks(a, b));
const select = page.querySelector('.selectAudio'); const select = page.querySelector('.selectAudio');
select.setLabel(globalize.translate('Audio')); select.setLabel(globalize.translate('Audio'));
const selectedId = mediaSource.DefaultAudioStreamIndex; const selectedId = mediaSource.DefaultAudioStreamIndex;
@ -303,31 +304,26 @@ function renderSubtitleSelections(page, mediaSources) {
const tracks = mediaSource.MediaStreams.filter(function (m) { const tracks = mediaSource.MediaStreams.filter(function (m) {
return m.Type === 'Subtitle'; return m.Type === 'Subtitle';
}); });
tracks.sort((a, b) => itemHelper.sortTracks(a, b));
const select = page.querySelector('.selectSubtitles'); const select = page.querySelector('.selectSubtitles');
select.setLabel(globalize.translate('Subtitles')); select.setLabel(globalize.translate('Subtitles'));
const selectedId = mediaSource.DefaultSubtitleStreamIndex == null ? -1 : mediaSource.DefaultSubtitleStreamIndex; const selectedId = mediaSource.DefaultSubtitleStreamIndex == null ? -1 : mediaSource.DefaultSubtitleStreamIndex;
const videoTracks = mediaSource.MediaStreams.filter(function (m) { let selected = selectedId === -1 ? ' selected' : '';
return m.Type === 'Video'; select.innerHTML = '<option value="-1">' + globalize.translate('Off') + '</option>' + tracks.map(function (v) {
}); selected = v.Index === selectedId ? ' selected' : '';
return '<option value="' + v.Index + '" ' + selected + '>' + v.DisplayTitle + '</option>';
}).join('');
// This only makes sense on Video items if (tracks.length > 0) {
if (videoTracks.length) { select.removeAttribute('disabled');
let selected = selectedId === -1 ? ' selected' : ''; } else {
select.innerHTML = '<option value="-1">' + globalize.translate('Off') + '</option>' + tracks.map(function (v) { select.setAttribute('disabled', 'disabled');
selected = v.Index === selectedId ? ' selected' : ''; }
return '<option value="' + v.Index + '" ' + selected + '>' + v.DisplayTitle + '</option>';
}).join('');
if (tracks.length > 0) {
select.removeAttribute('disabled');
} else {
select.setAttribute('disabled', 'disabled');
}
if (tracks.length) {
page.querySelector('.selectSubtitlesContainer').classList.remove('hide'); page.querySelector('.selectSubtitlesContainer').classList.remove('hide');
} else { } else {
select.innerHTML = '';
page.querySelector('.selectSubtitlesContainer').classList.add('hide'); page.querySelector('.selectSubtitlesContainer').classList.add('hide');
} }
} }