mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Changed from using sortOptions to using already implemented queryOptions
Null verification for parentid on shortcuts.js itemContextMenu is now obeying to sorting
This commit is contained in:
parent
580ad5f1a8
commit
ee791f9d0d
5 changed files with 70 additions and 47 deletions
|
@ -9,6 +9,8 @@ import itemHelper from './itemHelper';
|
|||
import { playbackManager } from './playback/playbackmanager';
|
||||
import ServerConnections from './ServerConnections';
|
||||
import toast from './toast/toast';
|
||||
import * as userSettings from '../scripts/settings/userSettings';
|
||||
import libraryMenu from '../scripts/libraryMenu';
|
||||
|
||||
export function getCommands(options) {
|
||||
const item = options.item;
|
||||
|
@ -567,6 +569,29 @@ 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) {
|
||||
let method = 'play';
|
||||
if (queue) {
|
||||
|
@ -589,9 +614,12 @@ function play(item, resume, queue, queueNext) {
|
|||
serverId: item.ServerId
|
||||
});
|
||||
} else {
|
||||
const sortParentId = item.IsFolder ? ('items-' + item.Id) : libraryMenu.getTopParentId() + '-' + getSettingsKey(item);
|
||||
const sortValues = userSettings.getSortValues(sortParentId);
|
||||
playbackManager[method]({
|
||||
items: [item],
|
||||
startPositionTicks: startPosition
|
||||
startPositionTicks: startPosition,
|
||||
queryOptions: sortValues
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue