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

Browse source
This commit is contained in:
Cameron 2020-08-08 18:42:06 +01:00 • committed by GitHub
commit db0c67d9b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 1034 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/livetvcomponents.js
View file

@ -1,6 +1,8 @@
define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layoutManager, datetime, cardBuilder, appHost) {
'use strict';
layoutManager = layoutManager.default || layoutManager;
function enableScrollX() {
return !layoutManager.desktop;
}

1
src/scripts/site.js
View file

@ -350,6 +350,7 @@ function initClient() {
}
function getLayoutManager(layoutManager, appHost) {
layoutManager = layoutManager.default || layoutManager;
if (appHost.getDefaultLayout) {
layoutManager.defaultLayout = appHost.getDefaultLayout();
}