mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' into es6-subtitlesettings
This commit is contained in:
commit
2a30ed6461
222 changed files with 5287 additions and 2717 deletions
|
@ -314,6 +314,13 @@ var AppInfo = {};
|
|||
return obj;
|
||||
}
|
||||
|
||||
function returnDefault(obj) {
|
||||
if (obj.default === null) {
|
||||
throw new Error('Object has no default!');
|
||||
}
|
||||
return obj.default;
|
||||
}
|
||||
|
||||
function getBowerPath() {
|
||||
return 'libraries';
|
||||
}
|
||||
|
@ -375,8 +382,8 @@ var AppInfo = {};
|
|||
|
||||
define('filesystem', [scriptsPath + '/filesystem'], returnFirstDependency);
|
||||
|
||||
define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
|
||||
define('shell', [componentsPath + '/shell'], returnFirstDependency);
|
||||
define('lazyLoader', [componentsPath + '/lazyLoader/lazyLoaderIntersectionObserver'], returnFirstDependency);
|
||||
define('shell', [scriptsPath + '/shell'], returnFirstDependency);
|
||||
|
||||
if ('registerElement' in document) {
|
||||
define('registerElement', []);
|
||||
|
@ -397,8 +404,8 @@ var AppInfo = {};
|
|||
define('prompt', [componentsPath + '/prompt/prompt'], returnFirstDependency);
|
||||
|
||||
define('loading', [componentsPath + '/loading/loading'], returnFirstDependency);
|
||||
define('multi-download', [componentsPath + '/multidownload'], returnFirstDependency);
|
||||
define('fileDownloader', [componentsPath + '/filedownloader'], returnFirstDependency);
|
||||
define('multi-download', [scriptsPath + '/multiDownload'], returnFirstDependency);
|
||||
define('fileDownloader', [scriptsPath + '/fileDownloader'], returnFirstDependency);
|
||||
|
||||
define('castSenderApiLoader', [componentsPath + '/castSenderApi'], returnFirstDependency);
|
||||
}
|
||||
|
@ -481,16 +488,16 @@ var AppInfo = {};
|
|||
var list = [
|
||||
'components/playback/playaccessvalidation',
|
||||
'components/playback/experimentalwarnings',
|
||||
'components/htmlaudioplayer/plugin',
|
||||
'components/htmlvideoplayer/plugin',
|
||||
'components/photoplayer/plugin',
|
||||
'components/htmlAudioPlayer/plugin',
|
||||
'components/htmlVideoPlayer/plugin',
|
||||
'components/photoPlayer/plugin',
|
||||
'components/youtubeplayer/plugin',
|
||||
'components/backdropscreensaver/plugin',
|
||||
'components/logoscreensaver/plugin'
|
||||
'components/backdropScreensaver/plugin',
|
||||
'components/logoScreensaver/plugin'
|
||||
];
|
||||
|
||||
if (appHost.supports('remotecontrol')) {
|
||||
list.push('components/sessionplayer');
|
||||
list.push('components/sessionPlayer');
|
||||
|
||||
if (browser.chrome || browser.opera) {
|
||||
list.push('components/chromecast/chromecastplayer');
|
||||
|
@ -532,16 +539,16 @@ var AppInfo = {};
|
|||
|
||||
window.Emby.Page = appRouter;
|
||||
|
||||
require(['emby-button', 'scripts/themeloader', 'libraryMenu', 'scripts/routes'], function () {
|
||||
require(['emby-button', 'scripts/themeLoader', 'libraryMenu', 'scripts/routes'], function () {
|
||||
Emby.Page.start({
|
||||
click: false,
|
||||
hashbang: true
|
||||
});
|
||||
|
||||
require(['components/thememediaplayer', 'scripts/autobackdrops']);
|
||||
require(['components/themeMediaPlayer', 'scripts/autoBackdrops']);
|
||||
|
||||
if (!browser.tv && !browser.xboxOne && !browser.ps4) {
|
||||
require(['components/nowplayingbar/nowplayingbar']);
|
||||
require(['components/nowPlayingBar/nowPlayingBar']);
|
||||
}
|
||||
|
||||
if (appHost.supports('remotecontrol')) {
|
||||
|
@ -630,23 +637,23 @@ var AppInfo = {};
|
|||
var scriptsPath = getScriptsPath();
|
||||
|
||||
var paths = {
|
||||
browserdeviceprofile: 'scripts/browserdeviceprofile',
|
||||
browserdeviceprofile: 'scripts/browserDeviceProfile',
|
||||
browser: 'scripts/browser',
|
||||
libraryBrowser: 'scripts/librarybrowser',
|
||||
libraryBrowser: 'scripts/libraryBrowser',
|
||||
inputManager: 'scripts/inputManager',
|
||||
datetime: 'scripts/datetime',
|
||||
globalize: 'scripts/globalize',
|
||||
dfnshelper: 'scripts/dfnshelper',
|
||||
libraryMenu: 'scripts/librarymenu',
|
||||
libraryMenu: 'scripts/libraryMenu',
|
||||
playlisteditor: componentsPath + '/playlisteditor/playlisteditor',
|
||||
medialibrarycreator: componentsPath + '/medialibrarycreator/medialibrarycreator',
|
||||
medialibraryeditor: componentsPath + '/medialibraryeditor/medialibraryeditor',
|
||||
imageoptionseditor: componentsPath + '/imageoptionseditor/imageoptionseditor',
|
||||
medialibrarycreator: componentsPath + '/mediaLibraryCreator/mediaLibraryCreator',
|
||||
medialibraryeditor: componentsPath + '/mediaLibraryEditor/mediaLibraryEditor',
|
||||
imageoptionseditor: componentsPath + '/imageOptionsEditor/imageOptionsEditor',
|
||||
apphost: componentsPath + '/apphost',
|
||||
visibleinviewport: bowerPath + '/visibleinviewport',
|
||||
qualityoptions: componentsPath + '/qualityoptions',
|
||||
qualityoptions: componentsPath + '/qualityOptions',
|
||||
focusManager: componentsPath + '/focusManager',
|
||||
itemHelper: componentsPath + '/itemhelper',
|
||||
itemHelper: componentsPath + '/itemHelper',
|
||||
itemShortcuts: componentsPath + '/shortcuts',
|
||||
playQueueManager: componentsPath + '/playback/playqueuemanager',
|
||||
nowPlayingHelper: componentsPath + '/playback/nowplayinghelper',
|
||||
|
@ -738,7 +745,7 @@ var AppInfo = {};
|
|||
|
||||
// there are several objects that need to be instantiated
|
||||
// TODO find a better way to do this
|
||||
define('appFooter', [componentsPath + '/appfooter/appfooter'], returnFirstDependency);
|
||||
define('appFooter', [componentsPath + '/appFooter/appFooter'], returnFirstDependency);
|
||||
define('appFooter-shared', ['appFooter'], createSharedAppFooter);
|
||||
|
||||
// TODO remove these libraries
|
||||
|
@ -773,23 +780,23 @@ var AppInfo = {};
|
|||
|
||||
define('chromecastHelper', [componentsPath + '/chromecast/chromecasthelpers'], returnFirstDependency);
|
||||
define('mediaSession', [componentsPath + '/playback/mediasession'], returnFirstDependency);
|
||||
define('actionsheet', [componentsPath + '/actionsheet/actionsheet'], returnFirstDependency);
|
||||
define('tunerPicker', [componentsPath + '/tunerpicker'], returnFirstDependency);
|
||||
define('actionsheet', [componentsPath + '/actionSheet/actionSheet'], returnFirstDependency);
|
||||
define('tunerPicker', [componentsPath + '/tunerPicker'], returnFirstDependency);
|
||||
define('mainTabsManager', [componentsPath + '/maintabsmanager'], returnFirstDependency);
|
||||
define('imageLoader', [componentsPath + '/images/imageLoader'], returnFirstDependency);
|
||||
define('directorybrowser', [componentsPath + '/directorybrowser/directorybrowser'], returnFirstDependency);
|
||||
define('metadataEditor', [componentsPath + '/metadataeditor/metadataeditor'], returnFirstDependency);
|
||||
define('personEditor', [componentsPath + '/metadataeditor/personeditor'], returnFirstDependency);
|
||||
define('metadataEditor', [componentsPath + '/metadataEditor/metadataEditor'], returnFirstDependency);
|
||||
define('personEditor', [componentsPath + '/metadataEditor/personEditor'], returnFirstDependency);
|
||||
define('playerSelectionMenu', [componentsPath + '/playback/playerSelectionMenu'], returnFirstDependency);
|
||||
define('playerSettingsMenu', [componentsPath + '/playback/playersettingsmenu'], returnFirstDependency);
|
||||
define('playMethodHelper', [componentsPath + '/playback/playmethodhelper'], returnFirstDependency);
|
||||
define('brightnessOsd', [componentsPath + '/playback/brightnessosd'], returnFirstDependency);
|
||||
define('alphaNumericShortcuts', [scriptsPath + '/alphanumericshortcuts'], returnFirstDependency);
|
||||
define('multiSelect', [componentsPath + '/multiselect/multiselect'], returnFirstDependency);
|
||||
define('alphaPicker', [componentsPath + '/alphapicker/alphapicker'], returnFirstDependency);
|
||||
define('multiSelect', [componentsPath + '/multiSelect/multiSelect'], returnFirstDependency);
|
||||
define('alphaPicker', [componentsPath + '/alphaPicker/alphaPicker'], returnFirstDependency);
|
||||
define('tabbedView', [componentsPath + '/tabbedview/tabbedview'], returnFirstDependency);
|
||||
define('itemsTab', [componentsPath + '/tabbedview/itemstab'], returnFirstDependency);
|
||||
define('collectionEditor', [componentsPath + '/collectioneditor/collectioneditor'], returnFirstDependency);
|
||||
define('collectionEditor', [componentsPath + '/collectionEditor/collectionEditor'], returnFirstDependency);
|
||||
define('serverRestartDialog', [componentsPath + '/serverRestartDialog'], returnFirstDependency);
|
||||
define('playlistEditor', [componentsPath + '/playlisteditor/playlisteditor'], returnFirstDependency);
|
||||
define('recordingCreator', [componentsPath + '/recordingcreator/recordingcreator'], returnFirstDependency);
|
||||
|
@ -803,9 +810,9 @@ var AppInfo = {};
|
|||
define('itemIdentifier', [componentsPath + '/itemidentifier/itemidentifier'], returnFirstDependency);
|
||||
define('itemMediaInfo', [componentsPath + '/itemMediaInfo/itemMediaInfo'], returnFirstDependency);
|
||||
define('mediaInfo', [componentsPath + '/mediainfo/mediainfo'], returnFirstDependency);
|
||||
define('itemContextMenu', [componentsPath + '/itemcontextmenu'], returnFirstDependency);
|
||||
define('itemContextMenu', [componentsPath + '/itemContextMenu'], returnFirstDependency);
|
||||
define('imageEditor', [componentsPath + '/imageeditor/imageeditor'], returnFirstDependency);
|
||||
define('imageDownloader', [componentsPath + '/imagedownloader/imagedownloader'], returnFirstDependency);
|
||||
define('imageDownloader', [componentsPath + '/imageDownloader/imageDownloader'], returnFirstDependency);
|
||||
define('dom', [scriptsPath + '/dom'], returnFirstDependency);
|
||||
define('playerStats', [componentsPath + '/playerstats/playerstats'], returnFirstDependency);
|
||||
define('searchFields', [componentsPath + '/search/searchfields'], returnFirstDependency);
|
||||
|
@ -814,10 +821,14 @@ var AppInfo = {};
|
|||
define('subtitleAppearanceHelper', [componentsPath + '/subtitlesettings/subtitleappearancehelper'], returnFirstDependency);
|
||||
define('subtitleSettings', [componentsPath + '/subtitlesettings/subtitlesettings'], returnFirstDependency);
|
||||
define('settingsHelper', [componentsPath + '/settingshelper'], returnFirstDependency);
|
||||
define('displaySettings', [componentsPath + '/displaysettings/displaysettings'], returnFirstDependency);
|
||||
define('playbackSettings', [componentsPath + '/playbacksettings/playbacksettings'], returnFirstDependency);
|
||||
define('homescreenSettings', [componentsPath + '/homescreensettings/homescreensettings'], returnFirstDependency);
|
||||
define('displaySettings', [componentsPath + '/displaySettings/displaySettings'], returnFirstDependency);
|
||||
define('playbackSettings', [componentsPath + '/playbackSettings/playbackSettings'], returnFirstDependency);
|
||||
define('homescreenSettings', [componentsPath + '/homeScreenSettings/homeScreenSettings'], returnFirstDependency);
|
||||
define('playbackManager', [componentsPath + '/playback/playbackmanager'], getPlaybackManager);
|
||||
define('timeSyncManager', [componentsPath + '/syncplay/timeSyncManager'], returnDefault);
|
||||
define('groupSelectionMenu', [componentsPath + '/syncplay/groupSelectionMenu'], returnFirstDependency);
|
||||
define('syncPlayManager', [componentsPath + '/syncplay/syncPlayManager'], returnDefault);
|
||||
define('playbackPermissionManager', [componentsPath + '/syncplay/playbackPermissionManager'], returnDefault);
|
||||
define('layoutManager', [componentsPath + '/layoutManager', 'apphost'], getLayoutManager);
|
||||
define('homeSections', [componentsPath + '/homesections/homesections'], returnFirstDependency);
|
||||
define('playMenu', [componentsPath + '/playmenu'], returnFirstDependency);
|
||||
|
@ -827,10 +838,10 @@ var AppInfo = {};
|
|||
define('cardBuilder', [componentsPath + '/cardbuilder/cardBuilder'], returnFirstDependency);
|
||||
define('peoplecardbuilder', [componentsPath + '/cardbuilder/peoplecardbuilder'], returnFirstDependency);
|
||||
define('chaptercardbuilder', [componentsPath + '/cardbuilder/chaptercardbuilder'], returnFirstDependency);
|
||||
define('deleteHelper', [componentsPath + '/deletehelper'], returnFirstDependency);
|
||||
define('deleteHelper', [scriptsPath + '/deleteHelper'], returnFirstDependency);
|
||||
define('tvguide', [componentsPath + '/guide/guide'], returnFirstDependency);
|
||||
define('guide-settings-dialog', [componentsPath + '/guide/guide-settings'], returnFirstDependency);
|
||||
define('loadingDialog', [componentsPath + '/loadingdialog/loadingdialog'], returnFirstDependency);
|
||||
define('loadingDialog', [componentsPath + '/loadingDialog/loadingDialog'], returnFirstDependency);
|
||||
define('viewManager', [componentsPath + '/viewManager/viewManager'], function (viewManager) {
|
||||
window.ViewManager = viewManager;
|
||||
viewManager.dispatchPageEvents(true);
|
||||
|
@ -844,18 +855,17 @@ var AppInfo = {};
|
|||
define('viewSettings', [componentsPath + '/viewsettings/viewsettings'], returnFirstDependency);
|
||||
define('filterMenu', [componentsPath + '/filtermenu/filtermenu'], returnFirstDependency);
|
||||
define('sortMenu', [componentsPath + '/sortmenu/sortmenu'], returnFirstDependency);
|
||||
define('idb', [componentsPath + '/idb'], returnFirstDependency);
|
||||
define('sanitizefilename', [componentsPath + '/sanitizefilename'], returnFirstDependency);
|
||||
define('sanitizefilename', [componentsPath + '/sanitizeFilename'], returnFirstDependency);
|
||||
define('toast', [componentsPath + '/toast/toast'], returnFirstDependency);
|
||||
define('scrollHelper', [componentsPath + '/scrollhelper'], returnFirstDependency);
|
||||
define('touchHelper', [componentsPath + '/touchhelper'], returnFirstDependency);
|
||||
define('imageUploader', [componentsPath + '/imageuploader/imageuploader'], returnFirstDependency);
|
||||
define('scrollHelper', [scriptsPath + '/scrollHelper'], returnFirstDependency);
|
||||
define('touchHelper', [scriptsPath + '/touchHelper'], returnFirstDependency);
|
||||
define('imageUploader', [componentsPath + '/imageUploader/imageUploader'], returnFirstDependency);
|
||||
define('htmlMediaHelper', [componentsPath + '/htmlMediaHelper'], returnFirstDependency);
|
||||
define('viewContainer', [componentsPath + '/viewContainer'], returnFirstDependency);
|
||||
define('dialogHelper', [componentsPath + '/dialogHelper/dialogHelper'], returnFirstDependency);
|
||||
define('serverNotifications', [componentsPath + '/serverNotifications'], returnFirstDependency);
|
||||
define('serverNotifications', [scriptsPath + '/serverNotifications'], returnFirstDependency);
|
||||
define('skinManager', [componentsPath + '/skinManager'], returnFirstDependency);
|
||||
define('keyboardnavigation', [scriptsPath + '/keyboardnavigation'], returnFirstDependency);
|
||||
define('keyboardnavigation', [scriptsPath + '/keyboardNavigation'], returnFirstDependency);
|
||||
define('mouseManager', [scriptsPath + '/mouseManager'], returnFirstDependency);
|
||||
define('scrollManager', [componentsPath + '/scrollManager'], returnFirstDependency);
|
||||
define('autoFocuser', [componentsPath + '/autoFocuser'], returnFirstDependency);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue