mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' into Sorting-Only-Thumbnail-Fix-5584
This commit is contained in:
Marco
GitHub
commit
0f8d29a573
193 changed files with 5197 additions and 1973 deletions
|
|
@ -188,6 +188,27 @@ function supportsVc1(videoTestElement) {
|
|||
return browser.tizen || browser.web0s || browser.edgeUwp || videoTestElement.canPlayType('video/mp4; codecs="vc-1"').replace(/no/, '');
|
||||
}
|
||||
|
||||
function supportsHdr10(options) {
|
||||
return options.supportsHdr10 ?? (false // eslint-disable-line sonarjs/no-redundant-boolean
|
||||
|| browser.tizen
|
||||
|| browser.web0s
|
||||
|| browser.safari && ((browser.iOS && browser.iOSVersion >= 11) || browser.osx)
|
||||
// Chrome mobile and Firefox have no client side tone-mapping
|
||||
// Edge Chromium on Nvidia is known to have color issues on 10-bit video
|
||||
|| browser.chrome && !browser.mobile
|
||||
);
|
||||
}
|
||||
|
||||
function supportsHlg(options) {
|
||||
return options.supportsHlg ?? supportsHdr10(options);
|
||||
}
|
||||
|
||||
function supportsDolbyVision(options) {
|
||||
return options.supportsDolbyVision ?? (false // eslint-disable-line sonarjs/no-redundant-boolean
|
||||
|| browser.safari && ((browser.iOS && browser.iOSVersion >= 13) || browser.osx)
|
||||
);
|
||||
}
|
||||
|
||||
function getDirectPlayProfileForVideoContainer(container, videoAudioCodecs, videoTestElement, options) {
|
||||
let supported = false;
|
||||
let profileContainer = container;
|
||||
|
|
@ -897,25 +918,20 @@ export default function (options) {
|
|||
let vp9VideoRangeTypes = 'SDR';
|
||||
let av1VideoRangeTypes = 'SDR';
|
||||
|
||||
if (browser.safari && ((browser.iOS && browser.iOSVersion >= 11) || browser.osx)) {
|
||||
hevcVideoRangeTypes += '|HDR10|HLG';
|
||||
if ((browser.iOS && browser.iOSVersion >= 13) || browser.osx) {
|
||||
hevcVideoRangeTypes += '|DOVI';
|
||||
}
|
||||
if (supportsHdr10(options)) {
|
||||
hevcVideoRangeTypes += '|HDR10';
|
||||
vp9VideoRangeTypes += '|HDR10';
|
||||
av1VideoRangeTypes += '|HDR10';
|
||||
}
|
||||
|
||||
if (browser.tizen || browser.web0s) {
|
||||
hevcVideoRangeTypes += '|HDR10|HLG';
|
||||
vp9VideoRangeTypes += '|HDR10|HLG';
|
||||
av1VideoRangeTypes += '|HDR10|HLG';
|
||||
if (supportsHlg(options)) {
|
||||
hevcVideoRangeTypes += '|HLG';
|
||||
vp9VideoRangeTypes += '|HLG';
|
||||
av1VideoRangeTypes += '|HLG';
|
||||
}
|
||||
|
||||
// Chrome mobile and Firefox have no client side tone-mapping
|
||||
// Edge Chromium on Nvidia is known to have color issues on 10-bit video
|
||||
if (browser.chrome && !browser.mobile) {
|
||||
hevcVideoRangeTypes += '|HDR10|HLG';
|
||||
vp9VideoRangeTypes += '|HDR10|HLG';
|
||||
av1VideoRangeTypes += '|HDR10|HLG';
|
||||
if (supportsDolbyVision(options)) {
|
||||
hevcVideoRangeTypes += '|DOVI';
|
||||
}
|
||||
|
||||
const h264CodecProfileConditions = [
|
||||
|
|
|
|||
|
|
@ -327,8 +327,8 @@ function refreshLibraryInfoInDrawer(user) {
|
|||
html += '<h3 class="sidebarHeader">';
|
||||
html += globalize.translate('HeaderAdmin');
|
||||
html += '</h3>';
|
||||
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#/dashboard.html"><span class="material-icons navMenuOptionIcon dashboard" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('TabDashboard')}</span></a>`;
|
||||
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#/edititemmetadata.html"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Metadata')}</span></a>`;
|
||||
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#/dashboard"><span class="material-icons navMenuOptionIcon dashboard" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('TabDashboard')}</span></a>`;
|
||||
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#/metadata"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Metadata')}</span></a>`;
|
||||
html += '</div>';
|
||||
}
|
||||
|
||||
|
|
@ -376,249 +376,6 @@ function refreshLibraryInfoInDrawer(user) {
|
|||
}
|
||||
}
|
||||
|
||||
function refreshDashboardInfoInDrawer(page, apiClient) {
|
||||
currentDrawerType = 'admin';
|
||||
loadNavDrawer();
|
||||
|
||||
if (navDrawerScrollContainer.querySelector('.adminDrawerLogo')) {
|
||||
updateDashboardMenuSelectedItem(page);
|
||||
} else {
|
||||
createDashboardMenu(page, apiClient);
|
||||
}
|
||||
}
|
||||
|
||||
function isUrlInCurrentView(url) {
|
||||
return window.location.href.toString().toLowerCase().indexOf(url.toLowerCase()) !== -1;
|
||||
}
|
||||
|
||||
function updateDashboardMenuSelectedItem(page) {
|
||||
const links = navDrawerScrollContainer.querySelectorAll('.navMenuOption');
|
||||
const currentViewId = page.id;
|
||||
|
||||
for (let i = 0, length = links.length; i < length; i++) {
|
||||
let link = links[i];
|
||||
let selected = false;
|
||||
let pageIds = link.getAttribute('data-pageids');
|
||||
|
||||
if (pageIds) {
|
||||
pageIds = pageIds.split('|');
|
||||
selected = pageIds.indexOf(currentViewId) != -1;
|
||||
}
|
||||
|
||||
let pageUrls = link.getAttribute('data-pageurls');
|
||||
|
||||
if (pageUrls) {
|
||||
pageUrls = pageUrls.split('|');
|
||||
selected = pageUrls.filter(isUrlInCurrentView).length > 0;
|
||||
}
|
||||
|
||||
if (selected) {
|
||||
link.classList.add('navMenuOption-selected');
|
||||
let title = '';
|
||||
link = link.querySelector('.navMenuOptionText') || link;
|
||||
title += (link.innerText || link.textContent).trim();
|
||||
LibraryMenu.setTitle(title);
|
||||
} else {
|
||||
link.classList.remove('navMenuOption-selected');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function createToolsMenuList(pluginItems) {
|
||||
const links = [{
|
||||
name: globalize.translate('TabServer')
|
||||
}, {
|
||||
name: globalize.translate('TabDashboard'),
|
||||
href: '#/dashboard.html',
|
||||
pageIds: ['dashboardPage'],
|
||||
icon: 'dashboard'
|
||||
}, {
|
||||
name: globalize.translate('General'),
|
||||
href: '#/dashboardgeneral.html',
|
||||
pageIds: ['dashboardGeneralPage'],
|
||||
icon: 'settings'
|
||||
}, {
|
||||
name: globalize.translate('HeaderUsers'),
|
||||
href: '#/userprofiles.html',
|
||||
pageIds: ['userProfilesPage', 'newUserPage', 'editUserPage', 'userLibraryAccessPage', 'userParentalControlPage', 'userPasswordPage'],
|
||||
icon: 'people'
|
||||
}, {
|
||||
name: globalize.translate('HeaderLibraries'),
|
||||
href: '#/library.html',
|
||||
pageIds: ['mediaLibraryPage', 'librarySettingsPage', 'libraryDisplayPage', 'metadataImagesConfigurationPage', 'metadataNfoPage'],
|
||||
icon: 'folder'
|
||||
}, {
|
||||
name: globalize.translate('TitlePlayback'),
|
||||
icon: 'play_arrow',
|
||||
href: '#/encodingsettings.html',
|
||||
pageIds: ['encodingSettingsPage', 'playbackConfigurationPage', 'streamingSettingsPage']
|
||||
}];
|
||||
addPluginPagesToMainMenu(links, pluginItems, 'server');
|
||||
links.push({
|
||||
divider: true,
|
||||
name: globalize.translate('HeaderDevices')
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('HeaderDevices'),
|
||||
href: '#/devices.html',
|
||||
pageIds: ['devicesPage', 'devicePage'],
|
||||
icon: 'devices'
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('HeaderActivity'),
|
||||
href: '#/dashboard/activity',
|
||||
pageIds: ['serverActivityPage'],
|
||||
icon: 'assessment'
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('DLNA'),
|
||||
href: '#/dlnasettings.html',
|
||||
pageIds: ['dlnaSettingsPage', 'dlnaProfilesPage', 'dlnaProfilePage'],
|
||||
icon: 'input'
|
||||
});
|
||||
links.push({
|
||||
divider: true,
|
||||
name: globalize.translate('LiveTV')
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('LiveTV'),
|
||||
href: '#/livetvstatus.html',
|
||||
pageIds: ['liveTvStatusPage', 'liveTvTunerPage'],
|
||||
icon: 'live_tv'
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('HeaderDVR'),
|
||||
href: '#/livetvsettings.html',
|
||||
pageIds: ['liveTvSettingsPage'],
|
||||
icon: 'dvr'
|
||||
});
|
||||
addPluginPagesToMainMenu(links, pluginItems, 'livetv');
|
||||
links.push({
|
||||
divider: true,
|
||||
name: globalize.translate('TabAdvanced')
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('TabNetworking'),
|
||||
icon: 'cloud',
|
||||
href: '#/networking.html',
|
||||
pageIds: ['networkingPage']
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('HeaderApiKeys'),
|
||||
icon: 'vpn_key',
|
||||
href: '#/apikeys.html',
|
||||
pageIds: ['apiKeysPage']
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('TabLogs'),
|
||||
href: '#/log.html',
|
||||
pageIds: ['logPage'],
|
||||
icon: 'bug_report'
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('Notifications'),
|
||||
icon: 'notifications',
|
||||
href: '#/notificationsettings.html'
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('TabPlugins'),
|
||||
icon: 'shopping_cart',
|
||||
href: '#/installedplugins.html',
|
||||
pageIds: ['pluginsPage', 'pluginCatalogPage']
|
||||
});
|
||||
links.push({
|
||||
name: globalize.translate('TabScheduledTasks'),
|
||||
href: '#/scheduledtasks.html',
|
||||
pageIds: ['scheduledTasksPage', 'scheduledTaskPage'],
|
||||
icon: 'schedule'
|
||||
});
|
||||
if (hasUnsortedPlugins(pluginItems)) {
|
||||
links.push({
|
||||
divider: true,
|
||||
name: globalize.translate('TabPlugins')
|
||||
});
|
||||
addPluginPagesToMainMenu(links, pluginItems);
|
||||
}
|
||||
return links;
|
||||
}
|
||||
|
||||
function hasUnsortedPlugins(pluginItems) {
|
||||
for (const pluginItem of pluginItems) {
|
||||
if (pluginItem.EnableInMainMenu && pluginItem.MenuSection === undefined) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function addPluginPagesToMainMenu(links, pluginItems, section) {
|
||||
for (const pluginItem of pluginItems) {
|
||||
if (pluginItem.EnableInMainMenu && pluginItem.MenuSection === section) {
|
||||
links.push({
|
||||
name: pluginItem.DisplayName,
|
||||
icon: pluginItem.MenuIcon || 'folder',
|
||||
href: Dashboard.getPluginUrl(pluginItem.Name),
|
||||
pageUrls: [Dashboard.getPluginUrl(pluginItem.Name)]
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getToolsMenuLinks(apiClient) {
|
||||
return apiClient.getJSON(apiClient.getUrl('web/configurationpages') + '?pageType=PluginConfiguration&EnableInMainMenu=true').then(createToolsMenuList, function () {
|
||||
return createToolsMenuList([]);
|
||||
});
|
||||
}
|
||||
|
||||
function getToolsLinkHtml(item) {
|
||||
let menuHtml = '';
|
||||
let pageIds = item.pageIds ? item.pageIds.join('|') : '';
|
||||
pageIds = pageIds ? ' data-pageids="' + pageIds + '"' : '';
|
||||
let pageUrls = item.pageUrls ? item.pageUrls.join('|') : '';
|
||||
pageUrls = pageUrls ? ' data-pageurls="' + pageUrls + '"' : '';
|
||||
menuHtml += '<a is="emby-linkbutton" class="navMenuOption" href="' + item.href + '"' + pageIds + pageUrls + '>';
|
||||
|
||||
if (item.icon) {
|
||||
menuHtml += '<span class="material-icons navMenuOptionIcon ' + item.icon + '" aria-hidden="true"></span>';
|
||||
}
|
||||
|
||||
menuHtml += '<span class="navMenuOptionText">';
|
||||
menuHtml += escapeHtml(item.name);
|
||||
menuHtml += '</span>';
|
||||
return menuHtml + '</a>';
|
||||
}
|
||||
|
||||
function getToolsMenuHtml(apiClient) {
|
||||
return getToolsMenuLinks(apiClient).then(function (items) {
|
||||
let menuHtml = '';
|
||||
menuHtml += '<div class="drawerContent">';
|
||||
|
||||
for (const item of items) {
|
||||
if (item.href) {
|
||||
menuHtml += getToolsLinkHtml(item);
|
||||
} else if (item.name) {
|
||||
menuHtml += '<h3 class="sidebarHeader">';
|
||||
menuHtml += escapeHtml(item.name);
|
||||
menuHtml += '</h3>';
|
||||
}
|
||||
}
|
||||
|
||||
return menuHtml + '</div>';
|
||||
});
|
||||
}
|
||||
|
||||
function createDashboardMenu(page, apiClient) {
|
||||
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
|
||||
let html = '';
|
||||
html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="#/home.html">';
|
||||
html += '<img src="assets/img/icon-transparent.png" />';
|
||||
html += '</a>';
|
||||
html += toolsMenuHtml;
|
||||
navDrawerScrollContainer.innerHTML = html;
|
||||
updateDashboardMenuSelectedItem(page);
|
||||
});
|
||||
}
|
||||
|
||||
function onSidebarLinkClick() {
|
||||
const section = this.getElementsByClassName('sectionName')[0];
|
||||
const text = section ? section.innerHTML : this.innerHTML;
|
||||
|
|
@ -1026,15 +783,8 @@ pageClassOn('pageshow', 'page', function (e) {
|
|||
const isDashboardPage = page.classList.contains('type-interior');
|
||||
const isHomePage = page.classList.contains('homePage');
|
||||
const isLibraryPage = !isDashboardPage && page.classList.contains('libraryPage');
|
||||
const apiClient = getCurrentApiClient();
|
||||
|
||||
if (isDashboardPage) {
|
||||
if (mainDrawerButton) {
|
||||
mainDrawerButton.classList.remove('hide');
|
||||
}
|
||||
|
||||
refreshDashboardInfoInDrawer(page, apiClient);
|
||||
} else {
|
||||
if (!isDashboardPage) {
|
||||
if (mainDrawerButton) {
|
||||
if (enableLibraryNavDrawer || (isHomePage && enableLibraryNavDrawerHome)) {
|
||||
mainDrawerButton.classList.remove('hide');
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
import layoutManager from '../components/layoutManager';
|
||||
import cardBuilder from 'components/cardbuilder/cardBuilder';
|
||||
import layoutManager from 'components/layoutManager';
|
||||
import { getBackdropShape } from 'utils/card';
|
||||
|
||||
import datetime from './datetime';
|
||||
import cardBuilder from '../components/cardbuilder/cardBuilder';
|
||||
|
||||
function enableScrollX() {
|
||||
return !layoutManager.desktop;
|
||||
}
|
||||
|
||||
function getBackdropShape() {
|
||||
return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
|
||||
}
|
||||
|
||||
function getTimersHtml(timers, options) {
|
||||
options = options || {};
|
||||
|
||||
|
|
@ -78,7 +76,7 @@ function getTimersHtml(timers, options) {
|
|||
|
||||
html += cardBuilder.getCardsHtml({
|
||||
items: group.items,
|
||||
shape: getBackdropShape(),
|
||||
shape: getBackdropShape(enableScrollX()),
|
||||
showTitle: true,
|
||||
showParentTitleOrTitle: true,
|
||||
showAirTime: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue