1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge branch 'master' into hide-alphapicker

This commit is contained in:
Cameron 2020-09-11 22:38:47 +01:00 committed by GitHub
commit 6868cf5340
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
211 changed files with 2525 additions and 4788 deletions

View file

@ -189,7 +189,7 @@ import 'emby-itemscontainer';
const query = getQuery();
if (this.alphaPicker) {
this.alphaPicker.value(query.NameStartsWithOrGreater);
this.alphaPicker.value(query.NameStartsWith);
if (query.SortBy.indexOf('SortName') === 0) {
this.alphaPicker.visible(true);
@ -231,7 +231,7 @@ import 'emby-itemscontainer';
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
const newValue = e.detail.value;
const query = getQuery();
query.NameStartsWithOrGreater = newValue;
query.NameStartsWith = newValue;
query.StartIndex = 0;
reloadItems(tabContent);
});
@ -252,10 +252,10 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', (e) => {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionAlbumArtist'),
name: globalize.translate('AlbumArtist'),
id: 'AlbumArtist,SortName'
}, {
name: globalize.translate('OptionCommunityRating'),

View file

@ -169,7 +169,7 @@ import 'emby-itemscontainer';
const updateFilterControls = (tabContent) => {
const query = getQuery(tabContent);
this.alphaPicker.value(query.NameStartsWithOrGreater);
this.alphaPicker.value(query.NameStartsWith);
};
const data = {};
@ -201,7 +201,7 @@ import 'emby-itemscontainer';
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
const newValue = e.detail.value;
const query = getQuery(tabContent);
query.NameStartsWithOrGreater = newValue;
query.NameStartsWith = newValue;
query.StartIndex = 0;
reloadItems(tabContent);
});

View file

@ -158,13 +158,13 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionTrackName'),
id: 'Name'
}, {
name: globalize.translate('OptionAlbum'),
name: globalize.translate('Album'),
id: 'Album,SortName'
}, {
name: globalize.translate('OptionAlbumArtist'),
name: globalize.translate('AlbumArtist'),
id: 'AlbumArtist,Album,SortName'
}, {
name: globalize.translate('OptionArtist'),
name: globalize.translate('Artist'),
id: 'Artist,Album,SortName'
}, {
name: globalize.translate('OptionDateAdded'),
@ -179,7 +179,7 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,AlbumArtist,Album,SortName'
}, {
name: globalize.translate('OptionRuntime'),
name: globalize.translate('Runtime'),
id: 'Runtime,AlbumArtist,Album,SortName'
}],
callback: function () {