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 assets

This commit is contained in:
dkanada 2020-01-08 11:10:24 +09:00
commit 2f4cf8248b
124 changed files with 5363 additions and 2283 deletions

View file

@ -532,7 +532,9 @@ var AppInfo = {};
"components/htmlaudioplayer/plugin",
"components/htmlvideoplayer/plugin",
"components/photoplayer/plugin",
"components/youtubeplayer/plugin"
"components/youtubeplayer/plugin",
"components/backdropscreensaver/plugin",
"components/logoscreensaver/plugin"
];
if (appHost.supports("remotecontrol")) {
@ -594,6 +596,8 @@ var AppInfo = {};
require(["playerSelectionMenu", "components/playback/remotecontrolautoplay"]);
}
require(["components/screensavermanager"]);
if (!appHost.supports("physicalvolumecontrol") || browser.touch) {
require(["components/playback/volumeosd"]);
}
@ -671,7 +675,8 @@ var AppInfo = {};
autoPlayDetect: componentsPath + "/playback/autoplaydetect",
nowPlayingHelper: componentsPath + "/playback/nowplayinghelper",
pluginManager: componentsPath + "/pluginManager",
packageManager: componentsPath + "/packagemanager"
packageManager: componentsPath + "/packagemanager",
screensaverManager: componentsPath + "/screensavermanager"
};
requirejs.onError = onRequireJsError;