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 apiclient-be-gone

Browse source
This commit is contained in:
MrTimscampi 2020-05-07 16:37:48 +02:00
commit 45d8c5bc3a
13 changed files with 225 additions and 513 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/scripts/settings/userSettings.js
View file

@ -265,3 +265,33 @@ import events from 'events';
}
/* eslint-enable indent */
export default {
setUserInfo: setUserInfo,
getData: getData,
importFrom: importFrom,
set: set,
get: get,
serverConfig: serverConfig,
enableCinemaMode: enableCinemaMode,
enableNextVideoInfoOverlay: enableNextVideoInfoOverlay,
enableThemeSongs: enableThemeSongs,
enableThemeVideos: enableThemeVideos,
enableFastFadein: enableFastFadein,
enableBackdrops: enableBackdrops,
language: language,
dateTimeLocale: dateTimeLocale,
skipBackLength: skipBackLength,
skipForwardLength: skipForwardLength,
dashboardTheme: dashboardTheme,
skin: skin,
theme: theme,
screensaver: screensaver,
libraryPageSize: libraryPageSize,
soundEffects: soundEffects,
loadQuerySettings: loadQuerySettings,
saveQuerySettings: saveQuerySettings,
getSubtitleAppearanceSettings: getSubtitleAppearanceSettings,
setSubtitleAppearanceSettings: setSubtitleAppearanceSettings,
setFilter: setFilter,
getFilter: getFilter
};

17
src/scripts/site.js
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);
if ('registerElement' in document) {
@ -391,13 +386,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);
@ -563,7 +555,10 @@ var AppInfo = {};
require(['components/playback/volumeosd']);
}
require(['mediaSession', 'serverNotifications']);
if (navigator.mediaSession || window.NativeShell) {
require(['mediaSession']);
}
require(['serverNotifications']);
require(['date-fns', 'date-fns/locale']);
if (!browser.tv && !browser.xboxOne) {