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 remote-tracking branch 'upstream/master' into apphost-es6

Browse source
This commit is contained in:
MrTimscampi 2020-08-08 21:07:21 +02:00
commit 566a818ee6
71 changed files with 4609 additions and 4569 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/scripts/site.js
View file

@ -347,8 +347,10 @@ function initClient() {
}
function getLayoutManager(layoutManager, appHost) {
if (appHost.default.getDefaultLayout) {
layoutManager.defaultLayout = appHost.default.getDefaultLayout();
layoutManager = layoutManager.default || layoutManager;
appHost = appHost.default || appHost;
if (appHost.getDefaultLayout) {
layoutManager.defaultLayout = appHost.getDefaultLayout();
}
layoutManager.init();
@ -810,8 +812,8 @@ function initClient() {
define('tvguide', [componentsPath + '/guide/guide'], returnFirstDependency);
define('guide-settings-dialog', [componentsPath + '/guide/guide-settings'], returnFirstDependency);
define('viewManager', [componentsPath + '/viewManager/viewManager'], function (viewManager) {
window.ViewManager = viewManager;
viewManager.dispatchPageEvents(true);
window.ViewManager = viewManager.default;
viewManager.default.dispatchPageEvents(true);
return viewManager;
});
define('slideshow', [componentsPath + '/slideshow/slideshow'], returnFirstDependency);