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

update components

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-28 15:45:52 -05:00
parent 9f72147880
commit 576b872bde
9 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dashboard-ui/scripts/site.js
View file

@ -1878,6 +1878,13 @@ var AppInfo = {};
paths.wakeonlan = apiClientBowerPath + "/wakeonlan";
}
// hack for an android test before browserInfo is loaded
if (Dashboard.isRunningInCordova() && window.MainActivity) {
paths.appStorage = "cordova/android/appstorage";
} else {
paths.appStorage = apiClientBowerPath + "/appstorage";
}
var sha1Path = bowerPath + "/cryptojslib/components/sha1-min";
var md5Path = bowerPath + "/cryptojslib/components/md5-min";
var shim = {};
@ -1982,8 +1989,6 @@ var AppInfo = {};
define("localassetmanager", [apiClientBowerPath + "/localassetmanager"]);
define("fileupload", [apiClientBowerPath + "/fileupload"]);
}
define("apiclient-store", [apiClientBowerPath + "/store"]);
define("apiclient-deferred", ["legacy/deferred"]);
define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]);
@ -1996,14 +2001,6 @@ var AppInfo = {};
function init(hostingAppInfo) {
if (Dashboard.isRunningInCordova() && browserInfo.android) {
define("appstorage", ["cordova/android/appstorage"]);
} else {
define('appstorage', [], function () {
return appStorage;
});
}
if (Dashboard.isRunningInCordova() && browserInfo.android) {
define("nativedirectorychooser", ["cordova/android/nativedirectorychooser"]);
}
@ -2114,7 +2111,6 @@ var AppInfo = {};
deps.push('connectionmanagerfactory');
deps.push('credentialprovider');
deps.push('appstorage');
deps.push('scripts/appsettings');
deps.push('scripts/extensions');
@ -2424,15 +2420,17 @@ var AppInfo = {};
var initialDependencies = [];
initialDependencies.push('browser');
initialDependencies.push('apiclient-store');
initialDependencies.push('appStorage');
if (!window.Promise) {
initialDependencies.push('native-promise-only');
}
require(initialDependencies, function (browser) {
require(initialDependencies, function (browser, appStorage) {
window.browserInfo = browser;
window.appStorage = appStorage;
setAppInfo();
setDocumentClasses();