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 migrate-to-ES6-18

This commit is contained in:
Cameron 2020-07-29 12:44:03 +01:00 committed by GitHub
commit d1ccc6faea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
354 changed files with 8173 additions and 10219 deletions

View file

@ -10,6 +10,8 @@ import * as userSettings from 'userSettings';
import globalize from 'globalize';
import 'emby-itemscontainer';
libraryBrowser = libraryBrowser.default || libraryBrowser;
/* eslint-disable indent */
export default function (view, params, tabContent) {

View file

@ -8,6 +8,8 @@ import cardBuilder from 'cardBuilder';
import * as userSettings from 'userSettings';
import 'emby-itemscontainer';
libraryBrowser = libraryBrowser.default || libraryBrowser;
/* eslint-disable indent */
export default function (view, params, tabContent) {

View file

@ -3,6 +3,8 @@ import cardBuilder from 'cardBuilder';
import imageLoader from 'imageLoader';
import loading from 'loading';
libraryBrowser = libraryBrowser.default || libraryBrowser;
/* eslint-disable indent */
export default function (view, params, tabContent) {

View file

@ -3,6 +3,8 @@ import cardBuilder from 'cardBuilder';
import imageLoader from 'imageLoader';
import loading from 'loading';
libraryBrowser = libraryBrowser.default || libraryBrowser;
/* eslint-disable indent */
export default function (view, params, tabContent) {

View file

@ -57,9 +57,7 @@ import 'flexStyles';
EnableTotalRecordCount: false
};
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) {
const elem = page.querySelector('#recentlyAddedSongs');
let supportsImageAnalysis = appHost.supports('imageanalysis');
supportsImageAnalysis = false;
var elem = page.querySelector('#recentlyAddedSongs');
elem.innerHTML = cardBuilder.getCardsHtml({
items: items,
showUnplayedIndicator: false,
@ -68,10 +66,10 @@ import 'flexStyles';
showTitle: true,
showParentTitle: true,
lazy: true,
centerText: !supportsImageAnalysis,
overlayPlayButton: !supportsImageAnalysis,
centerText: true,
overlayPlayButton: true,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
cardLayout: false,
coverImage: true
});
imageLoader.lazyChildren(elem);
@ -106,9 +104,8 @@ import 'flexStyles';
elem.classList.add('hide');
}
const itemsContainer = elem.querySelector('.itemsContainer');
let supportsImageAnalysis = appHost.supports('imageanalysis');
supportsImageAnalysis = false;
var itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items,
showUnplayedIndicator: false,
@ -117,10 +114,10 @@ import 'flexStyles';
showParentTitle: true,
action: 'instantmix',
lazy: true,
centerText: !supportsImageAnalysis,
overlayMoreButton: !supportsImageAnalysis,
centerText: true,
overlayMoreButton: true,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
cardLayout: false,
coverImage: true
});
imageLoader.lazyChildren(itemsContainer);
@ -150,9 +147,7 @@ import 'flexStyles';
elem.classList.add('hide');
}
const itemsContainer = elem.querySelector('.itemsContainer');
let supportsImageAnalysis = appHost.supports('imageanalysis');
supportsImageAnalysis = false;
var itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items,
showUnplayedIndicator: false,
@ -161,10 +156,10 @@ import 'flexStyles';
showParentTitle: true,
action: 'instantmix',
lazy: true,
centerText: !supportsImageAnalysis,
overlayMoreButton: !supportsImageAnalysis,
centerText: true,
overlayMoreButton: true,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
cardLayout: false,
coverImage: true
});
imageLoader.lazyChildren(itemsContainer);
@ -358,8 +353,6 @@ import 'flexStyles';
function loadTab(page, index) {
currentTabIndex = index;
getTabController(page, index, function (controller) {
initialTabIndex = null;
if (renderedTabs.indexOf(index) == -1) {
renderedTabs.push(index);
controller.renderTab();
@ -375,10 +368,8 @@ import 'flexStyles';
}
}
let isViewRestored;
const self = this;
let currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
let initialTabIndex = currentTabIndex;
var self = this;
var currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
self.initTab = function () {
const tabContent = view.querySelector(".pageTabContent[data-index='0']");
@ -396,7 +387,6 @@ import 'flexStyles';
const tabControllers = [];
const renderedTabs = [];
view.addEventListener('viewshow', function (e) {
isViewRestored = e.detail.isRestored;
initTabs();
if (!view.getAttribute('data-title')) {
const parentId = params.topParentId;

View file

@ -7,6 +7,8 @@ import * as userSettings from 'userSettings';
import globalize from 'globalize';
import 'emby-itemscontainer';
libraryBrowser = libraryBrowser.default || libraryBrowser;
/* eslint-disable indent */
export default function (view, params, tabContent) {