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

Merge branch 'master' into eslint-no-sequences

Browse source
This commit is contained in:
San 2022-05-20 01:40:57 -07:00 • committed by GitHub
commit a2fe92f192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2166 additions and 1116 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/scripts/browserDeviceProfile.js
View file

@ -288,10 +288,16 @@ import browser from './browser';
}
}
return browser.ps4 ? 8000000 :
(browser.xboxOne ? 12000000 :
(browser.edgeUwp ? null :
(browser.tizen && isTizenFhd ? 20000000 : null)));
let bitrate = null;
if (browser.ps4) {
bitrate = 8000000;
} else if (browser.xboxOne) {
bitrate = 12000000;
} else if (browser.tizen && isTizenFhd) {
bitrate = 20000000;
}
return bitrate;
}
function getSpeakerCount() {
@ -370,13 +376,18 @@ import browser from './browser';
|| videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.6B"').replace(/no/, '')
|| videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp3"').replace(/no/, '');
// Not sure how to test for this
const supportsMp2VideoAudio = browser.edgeUwp || browser.tizen || browser.web0s;
let supportsMp2VideoAudio = options.supportsMp2VideoAudio;
if (supportsMp2VideoAudio == null) {
supportsMp2VideoAudio = browser.edgeUwp || browser.tizen || browser.web0s;
// If the browser supports MP3, it presumably supports MP2 as well
if (supportsMp3VideoAudio && (browser.chrome || browser.edgeChromium || (browser.firefox && browser.versionMajor >= 83))) {
supportsMp2VideoAudio = true;
}
}
/* eslint-disable compat/compat */
let maxVideoWidth = browser.xboxOne ?
(window.screen ? window.screen.width : null) :
null;
let maxVideoWidth = browser.xboxOne ? window.screen?.width : null;
/* eslint-enable compat/compat */
if (options.maxVideoWidth) {
@ -428,6 +439,8 @@ import browser from './browser';
if (supportsMp2VideoAudio) {
videoAudioCodecs.push('mp2');
hlsInTsVideoAudioCodecs.push('mp2');
hlsInFmp4VideoAudioCodecs.push('mp2');
}
let supportsDts = options.supportsDts;

7
src/scripts/libraryMenu.js
View file

@ -793,7 +793,12 @@ import { getParameterByName } from '../utils/url.ts';
}
function updateMenuForPageType(isDashboardPage, isLibraryPage) {
const newPageType = isDashboardPage ? 2 : isLibraryPage ? 1 : 3;
let newPageType = 3;
if (isDashboardPage) {
newPageType = 2;
} else if (isLibraryPage) {
newPageType = 1;
}
if (currentPageType !== newPageType) {
currentPageType = newPageType;

4
src/scripts/site.js
View file

@ -163,6 +163,10 @@ async function onAppReady() {
import('../assets/css/ios.scss');
}
Events.on(appHost, 'resume', () => {
ServerConnections.currentApiClient()?.ensureWebSocket();
});
appRouter.start();
if (!browser.tv && !browser.xboxOne && !browser.ps4) {