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

Added getSortOptions to userSettings.js and cleaned up the shortcuts.js and list.js to use the above method

Browse source
This commit is contained in:
MrK 2023-09-19 22:29:54 +01:00
parent f922742d86
commit 580ad5f1a8
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/shortcuts.js
View file

@ -166,14 +166,6 @@ function showPlayMenu(card, target) {
}); });
} }
function getSortValues(parentId) {
const basekey = 'items-' + parentId + '-Folder';
return {
sortBy: userSettings.getFilter(basekey + '-sortby'),
sortOrder: userSettings.getFilter(basekey + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
}
function executeAction(card, target, action) { function executeAction(card, target, action) {
target = target || card; target = target || card;
@ -184,11 +176,11 @@ function executeAction(card, target, action) {
id = card.getAttribute('data-id'); id = card.getAttribute('data-id');
} }
const item = getItemInfoFromCard(card);
const itemsContainer = dom.parentWithClass(card, 'itemsContainer'); const itemsContainer = dom.parentWithClass(card, 'itemsContainer');
const parentId = itemsContainer.getAttribute('data-parentid'); const sortParentId = 'items-' + (item.IsFolder ? item.Id : itemsContainer.getAttribute('data-parentid')) + '-Folder';
const item = getItemInfoFromCard(card);
const serverId = item.ServerId; const serverId = item.ServerId;
const type = item.Type; const type = item.Type;
@ -219,7 +211,7 @@ function executeAction(card, target, action) {
ids: [playableItemId], ids: [playableItemId],
startPositionTicks: startPositionTicks, startPositionTicks: startPositionTicks,
serverId: serverId, serverId: serverId,
sortOptions: getSortValues(parentId) sortOptions: userSettings.getSortValues(sortParentId)
}); });
} else { } else {
console.warn('Unable to play item', item); console.warn('Unable to play item', item);

5
src/controllers/list.js
View file

@ -962,10 +962,7 @@ class ItemsView {
getSortValues() { getSortValues() {
const basekey = this.getSettingsKey(); const basekey = this.getSettingsKey();
return { return userSettings.getSortValues(basekey);
sortBy: userSettings.getFilter(basekey + '-sortby') || this.getDefaultSortBy(),
sortOrder: userSettings.getFilter(basekey + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
} }
getDefaultSortBy() { getDefaultSortBy() {

13
src/scripts/settings/userSettings.js
View file

@ -622,6 +622,18 @@ export class UserSettings {
getFilter(key) { getFilter(key) {
return this.get(key, true); return this.get(key, true);
} }
/**
* Gets the current sort values
* @param {string} key - Filter key.
* @return {Object} sortOptions object
*/
getSortValues(key) {
return {
sortBy: this.getFilter(key + '-sortby'),
sortOrder: this.getFilter(key + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
}
} }
export const currentSettings = new UserSettings; export const currentSettings = new UserSettings;
@ -672,3 +684,4 @@ export const customCss = currentSettings.customCss.bind(currentSettings);
export const disableCustomCss = currentSettings.disableCustomCss.bind(currentSettings); export const disableCustomCss = currentSettings.disableCustomCss.bind(currentSettings);
export const getSavedView = currentSettings.getSavedView.bind(currentSettings); export const getSavedView = currentSettings.getSavedView.bind(currentSettings);
export const saveViewSetting = currentSettings.saveViewSetting.bind(currentSettings); export const saveViewSetting = currentSettings.saveViewSetting.bind(currentSettings);
export const getSortValues = currentSettings.getSortValues.bind(currentSettings);