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

itemContextMenu only supports folders and using parentId instead for lists

Browse source 
Revert line change on playbackmanager.js
This commit is contained in:
MrK 2023-10-02 23:25:57 +01:00
parent 5d20523616
commit d62a36a708
2 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/components/itemContextMenu.js
View file

@ -10,7 +10,6 @@ import { playbackManager } from './playback/playbackmanager';
import ServerConnections from './ServerConnections'; import ServerConnections from './ServerConnections';
import toast from './toast/toast'; import toast from './toast/toast';
import * as userSettings from '../scripts/settings/userSettings'; import * as userSettings from '../scripts/settings/userSettings';
import libraryMenu from '../scripts/libraryMenu';
export function getCommands(options) { export function getCommands(options) {
const item = options.item; const item = options.item;
@ -569,29 +568,6 @@ function deleteSeriesTimer(apiClient, item, resolve, command) {
}); });
} }
function getSettingsKey(item) {
if (item.IsFolder) {
return 'Folder';
}
const itemType = item.MediaType;
switch (itemType) {
case 'Movie':
case 'BoxSet':
case 'Video':
return 'movies';
case 'Audio':
return 'songs';
case 'MusicAlbum':
return 'musicalbums';
case 'MusicArtist':
return 'musicartists';
case 'MusicGenre':
return 'genres';
case 'MusicPlaylist':
return 'musicplaylists';
}
}
function play(item, resume, queue, queueNext) { function play(item, resume, queue, queueNext) {
let method = 'play'; let method = 'play';
if (queue) { if (queue) {
@ -614,8 +590,8 @@ function play(item, resume, queue, queueNext) {
serverId: item.ServerId serverId: item.ServerId
}); });
} else { } else {
const sortParentId = item.IsFolder ? ('items-' + item.Id) : libraryMenu.getTopParentId() + '-' + getSettingsKey(item); const sortParentId = 'items-' + (item.IsFolder ? item.Id : item.ParentId) + '-Folder';
const sortValues = userSettings.getSortValues(sortParentId); const sortValues = userSettings.getSortValuesLegacy(sortParentId);
playbackManager[method]({ playbackManager[method]({
items: [item], items: [item],

2
src/components/playback/playbackmanager.js
View file

@ -1814,8 +1814,8 @@ class PlaybackManager {
Filters: 'IsNotFolder', Filters: 'IsNotFolder',
// Setting this to true may cause some incorrect sorting // Setting this to true may cause some incorrect sorting
Recursive: false, Recursive: false,
MediaTypes: 'Photo,Video',
SortBy: options.shuffle ? 'Random' : 'SortName', SortBy: options.shuffle ? 'Random' : 'SortName',
MediaTypes: 'Photo,Video',
Limit: UNLIMITED_ITEMS Limit: UNLIMITED_ITEMS
}, queryOptions)).then(function (result) { }, queryOptions)).then(function (result) {
const playbackItems = result.Items; const playbackItems = result.Items;