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 media-session

This commit is contained in:
Julien Machiels 2020-05-07 13:31:48 +02:00 committed by GitHub
commit 14c74ee0b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 159 additions and 398 deletions

View file

@ -375,12 +375,7 @@ var AppInfo = {};
define('filesystem', [scriptsPath + '/filesystem'], returnFirstDependency);
if (window.IntersectionObserver && !browser.edge) {
define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
} else {
define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-scroll'], returnFirstDependency);
}
define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
define('shell', [componentsPath + '/shell'], returnFirstDependency);
define('apiclient', [bowerPath + '/apiclient/apiclient'], returnFirstDependency);
@ -393,13 +388,10 @@ var AppInfo = {};
define('registerElement', ['document-register-element'], returnFirstDependency);
}
define('imageFetcher', [componentsPath + '/images/imageFetcher'], returnFirstDependency);
var preferNativeAlerts = browser.tv;
define('alert', [componentsPath + '/alert'], returnFirstDependency);
defineResizeObserver();
define('dialog', [componentsPath + '/dialog/dialog'], returnFirstDependency);
define('confirm', [componentsPath + '/confirm/confirm'], returnFirstDependency);