mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge remote-tracking branch 'upstream/master' into translate-everything
This commit is contained in:
commit
3543a60b8b
53 changed files with 1287 additions and 1116 deletions
|
@ -355,39 +355,6 @@ var AppInfo = {};
|
|||
return headroom;
|
||||
}
|
||||
|
||||
function getCastSenderApiLoader() {
|
||||
var ccLoaded = false;
|
||||
return {
|
||||
load: function () {
|
||||
if (ccLoaded) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
return new Promise(function (resolve, reject) {
|
||||
var fileref = document.createElement("script");
|
||||
fileref.setAttribute("type", "text/javascript");
|
||||
|
||||
fileref.onload = function () {
|
||||
ccLoaded = true;
|
||||
resolve();
|
||||
};
|
||||
|
||||
fileref.setAttribute("src", "https://www.gstatic.com/cv/js/sender/v1/cast_sender.js");
|
||||
document.querySelector("head").appendChild(fileref);
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function getDummyCastSenderApiLoader() {
|
||||
return {
|
||||
load: function () {
|
||||
window.chrome = window.chrome || {};
|
||||
return Promise.resolve();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function createSharedAppFooter(appFooter) {
|
||||
return new appFooter({});
|
||||
}
|
||||
|
@ -439,28 +406,16 @@ var AppInfo = {};
|
|||
defineResizeObserver();
|
||||
define("dialog", [componentsPath + "/dialog/dialog"], returnFirstDependency);
|
||||
|
||||
if (preferNativeAlerts && window.confirm) {
|
||||
define("confirm", [componentsPath + "/confirm/nativeconfirm"], returnFirstDependency);
|
||||
} else {
|
||||
define("confirm", [componentsPath + "/confirm/confirm"], returnFirstDependency);
|
||||
}
|
||||
define("confirm", [componentsPath + "/confirm/confirm"], returnFirstDependency);
|
||||
|
||||
if ((preferNativeAlerts || browser.xboxOne) && window.confirm) {
|
||||
define("prompt", [componentsPath + "/prompt/nativeprompt"], returnFirstDependency);
|
||||
} else {
|
||||
define("prompt", [componentsPath + "/prompt/prompt"], returnFirstDependency);
|
||||
}
|
||||
define("prompt", [componentsPath + "/prompt/prompt"], returnFirstDependency);
|
||||
|
||||
define("loading", [componentsPath + "/loading/loading"], returnFirstDependency);
|
||||
define("multi-download", [componentsPath + "/multidownload"], returnFirstDependency);
|
||||
define("fileDownloader", [componentsPath + "/filedownloader"], returnFirstDependency);
|
||||
define("localassetmanager", [bowerPath + "/apiclient/localassetmanager"], returnFirstDependency);
|
||||
|
||||
if ("cordova" === self.appMode || "android" === self.appMode) {
|
||||
define("castSenderApiLoader", [], getDummyCastSenderApiLoader);
|
||||
} else {
|
||||
define("castSenderApiLoader", [], getCastSenderApiLoader);
|
||||
}
|
||||
define("castSenderApiLoader", [componentsPath + "/castSenderApi"], returnFirstDependency);
|
||||
|
||||
define("transfermanager", [bowerPath + "/apiclient/sync/transfermanager"], returnFirstDependency);
|
||||
define("filerepository", [bowerPath + "/apiclient/sync/filerepository"], returnFirstDependency);
|
||||
|
@ -734,8 +689,8 @@ var AppInfo = {};
|
|||
"resize-observer-polyfill",
|
||||
"shaka",
|
||||
"swiper",
|
||||
"queryString",
|
||||
"sortable",
|
||||
"libjass",
|
||||
"webcomponents",
|
||||
"material-icons",
|
||||
"jellyfin-noto",
|
||||
|
@ -800,9 +755,6 @@ var AppInfo = {};
|
|||
define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
|
||||
define("scroller", [componentsPath + "/scroller"], returnFirstDependency);
|
||||
define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency);
|
||||
define("queryString", [bowerPath + "/query-string/index"], function () {
|
||||
return queryString;
|
||||
});
|
||||
|
||||
define("emby-button", [elementsPath + "/emby-button/emby-button"], returnFirstDependency);
|
||||
define("paper-icon-button-light", [elementsPath + "/emby-button/paper-icon-button-light"], returnFirstDependency);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue