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 pull request #328 from jellyfin/release-10.3.z

Browse source 
Backmerge for Release 10.3.3
This commit is contained in:
Bond-009 2019-05-18 12:55:59 +02:00 • committed by GitHub
commit 3245e5c0d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 364 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/scripts/site.js
View file

@ -467,6 +467,13 @@ var AppInfo = {};
define("buttonenabled", ["legacy/buttonenabled"], returnFirstDependency);
var promises = [];
if (!window.fetch) {
promises.push(require(["fetch"]));
}
if ("function" != typeof Object.assign) {
promises.push(require(["objectassign"]));
}
Promise.all(promises).then(function () {
createConnectionManager().then(function () {
console.log("initAfterDependencies promises resolved");
@ -818,6 +825,8 @@ var AppInfo = {};
define("jstree", ["thirdparty/jstree/jstree", "css!thirdparty/jstree/themes/default/style.css"], returnFirstDependency);
define("dashboardcss", ["css!css/dashboard"], returnFirstDependency);
define("slideshow", [componentsPath + "/slideshow/slideshow"], returnFirstDependency);
define("fetch", [bowerPath + "/fetch/fetch"], returnFirstDependency);
define("objectassign", [componentsPath + "/polyfills/objectassign"], returnFirstDependency);
define("clearButtonStyle", ["css!" + componentsPath + "/clearbutton"], returnFirstDependency);
define("userdataButtons", [componentsPath + "/userdatabuttons/userdatabuttons"], returnFirstDependency);
define("emby-playstatebutton", [componentsPath + "/userdatabuttons/emby-playstatebutton"], returnFirstDependency);
@ -1135,7 +1144,7 @@ var AppInfo = {};
})();
require(["css!css/site"]);
return require(["browser"], onWebComponentsReady);
}();
pageClassOn("viewshow", "standalonePage", function () {