milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into hide-alphapicker

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/movies/moviecollections.js
View file

@ -210,7 +210,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionImdbRating'),

16
src/controllers/movies/movies.js
View file

@ -25,7 +25,7 @@ import 'emby-itemscontainer';
const updateFilterControls = () => {
if (this.alphaPicker) {
this.alphaPicker.value(query.NameStartsWithOrGreater);
this.alphaPicker.value(query.NameStartsWith);
if (query.SortBy.indexOf('SortName') === 0) {
this.alphaPicker.visible(true);
} else {
@ -168,12 +168,12 @@ import 'emby-itemscontainer';
itemsContainer.fetchData = fetchData;
itemsContainer.getItemsHtml = getItemsHtml;
itemsContainer.afterRefresh = afterRefresh;
let alphaPickerElement = tabContent.querySelector('.alphaPicker');
const alphaPickerElement = tabContent.querySelector('.alphaPicker');
if (alphaPickerElement) {
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
let newValue = e.detail.value;
query.NameStartsWithOrGreater = newValue;
const newValue = e.detail.value;
query.NameStartsWith = newValue;
query.StartIndex = 0;
itemsContainer.refreshItems();
});
@ -200,7 +200,7 @@ import 'emby-itemscontainer';
btnSort.addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName,ProductionYear'
}, {
name: globalize.translate('OptionImdbRating'),
@ -224,7 +224,7 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,SortName,ProductionYear'
}, {
name: globalize.translate('OptionRuntime'),
name: globalize.translate('Runtime'),
id: 'Runtime,SortName,ProductionYear'
}],
callback: function () {
@ -242,7 +242,7 @@ import 'emby-itemscontainer';
libraryBrowser.showLayoutMenu(e.target, this.getCurrentViewStyle, 'Banner,List,Poster,PosterCard,Thumb,ThumbCard'.split(','));
});
btnSelectView.addEventListener('layoutchange', function (e) {
let viewStyle = e.detail.viewStyle;
const viewStyle = e.detail.viewStyle;
userSettings.set(savedViewKey, viewStyle);
query.StartIndex = 0;
onViewStyleChange();
@ -279,7 +279,7 @@ import 'emby-itemscontainer';
this.showFilterMenu = function () {
import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
let filterDialog = new filterDialogFactory({
const filterDialog = new filterDialogFactory({
query: query,
mode: 'movies',
serverId: ApiClient.serverId()

14
src/controllers/movies/moviesrecommended.js
View file

@ -58,7 +58,7 @@ import 'emby-button';
}
function loadResume(page, userId, parentId) {
let screenWidth = dom.getWindowSize().innerWidth;
const screenWidth = dom.getWindowSize().innerWidth;
const options = {
SortBy: 'DatePlayed',
SortOrder: 'Descending',
@ -154,8 +154,8 @@ import 'emby-button';
}
function loadSuggestions(page, userId, parentId) {
let screenWidth = dom.getWindowSize().innerWidth;
let url = ApiClient.getUrl('Movies/Recommendations', {
const screenWidth = dom.getWindowSize().innerWidth;
const url = ApiClient.getUrl('Movies/Recommendations', {
userId: userId,
categoryLimit: 6,
ItemLimit: screenWidth >= 1920 ? 8 : screenWidth >= 1600 ? 8 : screenWidth >= 1200 ? 6 : 5,
@ -172,7 +172,7 @@ import 'emby-button';
const html = recommendations.map(getRecommendationHtml).join('');
page.querySelector('.noItemsMessage').classList.add('hide');
let recs = page.querySelector('.recommendations');
const recs = page.querySelector('.recommendations');
recs.innerHTML = html;
imageLoader.lazyChildren(recs);
@ -381,16 +381,16 @@ import 'emby-button';
const suggestionsTabIndex = 1;
this.initTab = function () {
let tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']");
const tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']");
initSuggestedTab(view, tabContent);
};
this.renderTab = function () {
let tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']");
const tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']");
loadSuggestionsTab(view, params, tabContent);
};
let tabControllers = [];
const tabControllers = [];
let renderedTabs = [];
view.addEventListener('viewshow', function (e) {
initTabs();

6
src/controllers/movies/movietrailers.js
View file

@ -185,7 +185,7 @@ import 'emby-itemscontainer';
const updateFilterControls = (tabContent) => {
const query = getQuery(tabContent);
this.alphaPicker.value(query.NameStartsWithOrGreater);
this.alphaPicker.value(query.NameStartsWith);
};
const data = {};
@ -216,7 +216,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();
});
@ -235,7 +235,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionImdbRating'),