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 es6

Browse source
This commit is contained in:
dkanada 2020-04-06 19:16:50 +09:00 • committed by GitHub
commit e940015fa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 1236 additions and 749 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/scripts/site.js
View file

@ -323,11 +323,11 @@ var AppInfo = {};
}
function getElementsPath() {
return "elements"
return "elements";
}
function getScriptsPath() {
return "scripts"
return "scripts";
}
function getPlaybackManager(playbackManager) {
@ -574,6 +574,7 @@ var AppInfo = {};
}
require(["mediaSession", "serverNotifications"]);
require(["date-fns", "date-fns/locale"]);
if (!browser.tv && !browser.xboxOne) {
require(["components/playback/playbackorientation"]);
@ -647,12 +648,12 @@ var AppInfo = {};
inputManager: "scripts/inputManager",
datetime: "scripts/datetime",
globalize: "scripts/globalize",
dfnshelper: "scripts/dfnshelper",
libraryMenu: "scripts/librarymenu",
playlisteditor: componentsPath + "/playlisteditor/playlisteditor",
medialibrarycreator: componentsPath + "/medialibrarycreator/medialibrarycreator",
medialibraryeditor: componentsPath + "/medialibraryeditor/medialibraryeditor",
imageoptionseditor: componentsPath + "/imageoptionseditor/imageoptionseditor",
humanedate: componentsPath + "/humanedate",
apphost: componentsPath + "/apphost",
visibleinviewport: componentsPath + "/visibleinviewport",
qualityoptions: componentsPath + "/qualityoptions",
@ -693,8 +694,10 @@ var AppInfo = {};
"webcomponents",
"material-icons",
"jellyfin-noto",
"date-fns",
"page",
"polyfill"
"polyfill",
"classlist-polyfill"
]
},
urlArgs: urlArgs,
@ -703,6 +706,7 @@ var AppInfo = {};
});
require(["polyfill"]);
require(["classlist-polyfill"]);
// Expose jQuery globally
require(["jQuery"], function(jQuery) {