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 routes

This commit is contained in:
dkanada 2020-04-25 10:54:34 +09:00
commit a98625cc5b
13 changed files with 95 additions and 45 deletions

View file

@ -29,6 +29,16 @@
);
}
try {
Promise.resolve();
} catch (ex) {
// this checks for several cases actually, typical is
// Promise() being missing on some legacy browser, and a funky one
// is Promise() present but buggy on WebOS 2
window.Promise = undefined;
self.Promise = undefined;
}
if (!self.Promise) {
// Load Promise polyfill if they are not natively supported
injectScriptElement(

View file

@ -733,8 +733,8 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
function initHeadRoom(elem) {
require(["headroom"], function (Headroom) {
var headroom = new Headroom([], {});
headroom.add(elem);
var headroom = new Headroom(elem);
headroom.init();
});
}

View file

@ -350,11 +350,6 @@ var AppInfo = {};
return layoutManager;
}
function createWindowHeadroom(Headroom) {
var headroom = new Headroom([], {});
return headroom;
}
function createSharedAppFooter(appFooter) {
return new appFooter({});
}
@ -705,7 +700,8 @@ var AppInfo = {};
"fast-text-encoding",
"intersection-observer",
"classlist-polyfill",
"screenfull"
"screenfull",
"headroom"
]
},
urlArgs: urlArgs,
@ -764,7 +760,6 @@ var AppInfo = {};
// TODO remove these libraries
// all of these have been modified so we need to fix that first
define("headroom", [bowerPath + "/headroom/headroom"], returnFirstDependency);
define("scroller", [bowerPath + "/scroller"], returnFirstDependency);
define("navdrawer", [bowerPath + "/navdrawer/navdrawer"], returnFirstDependency);