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-12-27 16:53:48 -05:00
parent 942a0512d8
commit e34c5d4388
9 changed files with 41 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1192,7 +1192,6 @@ var AppInfo = {};
apiclient: apiClientBowerPath + '/apiclient',
connectionManagerFactory: bowerPath + '/emby-apiclient/connectionmanager',
visibleinviewport: embyWebComponentsBowerPath + "/visibleinviewport",
filesystem: embyWebComponentsBowerPath + "/filesystem",
browserdeviceprofile: embyWebComponentsBowerPath + "/browserdeviceprofile",
browser: embyWebComponentsBowerPath + "/browser",
inputManager: embyWebComponentsBowerPath + "/inputmanager",
@ -1322,8 +1321,10 @@ var AppInfo = {};
// hack for an android test before browserInfo is loaded
if (Dashboard.isRunningInCordova() && window.MainActivity) {
paths.appStorage = "cordova/android/appstorage";
paths.filesystem = 'cordova/filesystem';
} else {
paths.appStorage = getAppStorage(apiClientBowerPath);
paths.filesystem = embyWebComponentsBowerPath + '/filesystem';
}
var sha1Path = bowerPath + "/cryptojslib/components/sha1-min";
@ -1392,15 +1393,14 @@ var AppInfo = {};
if (Dashboard.isRunningInCordova()) {
define("iapManager", ["cordova/iap"], returnFirstDependency);
define("localassetmanager", ["cordova/localassetmanager"], returnFirstDependency);
define("fileupload", ["cordova/fileupload"], returnFirstDependency);
} else {
define("iapManager", ["components/iap"], returnFirstDependency);
define("localassetmanager", [apiClientBowerPath + "/localassetmanager"], returnFirstDependency);
define("fileupload", [apiClientBowerPath + "/fileupload"], returnFirstDependency);
}
define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]);
define("cameraRoll", [apiClientBowerPath + "/cameraroll"], returnFirstDependency);
define("contentuploader", [apiClientBowerPath + "/sync/contentuploader"]);
define("serversync", [apiClientBowerPath + "/sync/serversync"]);
define("multiserversync", [apiClientBowerPath + "/sync/multiserversync"]);
@ -1640,7 +1640,7 @@ var AppInfo = {};
function initRequireWithBrowser(browser) {
var bowerPath = getBowerPath();
var apiClientBowerPath = bowerPath + "/emby-apiclient";
var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents';
if (Dashboard.isRunningInCordova()) {
@ -1664,7 +1664,7 @@ var AppInfo = {};
}
if (Dashboard.isRunningInCordova() && browser.safari) {
define("imageFetcher", ['cordova/ios/imagestore'], returnFirstDependency);
define("imageFetcher", ['cordova/imagestore'], returnFirstDependency);
} else {
define("imageFetcher", [embyWebComponentsBowerPath + "/images/basicimagefetcher"], returnFirstDependency);
}
@ -1703,8 +1703,10 @@ var AppInfo = {};
if (Dashboard.isRunningInCordova() && browser.android) {
define("fileDownloader", ['cordova/android/filedownloader'], returnFirstDependency);
define("localassetmanager", ["cordova/localassetmanager"], returnFirstDependency);
} else {
define("fileDownloader", [embyWebComponentsBowerPath + '/filedownloader'], returnFirstDependency);
define("localassetmanager", [apiClientBowerPath + "/localassetmanager"], returnFirstDependency);
}
}
@ -1722,7 +1724,7 @@ var AppInfo = {};
define("videorenderer", ["cordova/android/vlcplayer"]);
}
else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
define("audiorenderer", ["cordova/ios/audioplayer"]);
define("audiorenderer", ["cordova/audioplayer"]);
define("videorenderer", ["scripts/htmlmediarenderer"]);
}
else {
@ -2697,12 +2699,12 @@ var AppInfo = {};
} else if (browserInfo.safari) {
postInitDependencies.push('cordova/ios/volume');
postInitDependencies.push('cordova/ios/chromecast');
postInitDependencies.push('cordova/ios/orientation');
postInitDependencies.push('cordova/ios/remotecontrols');
postInitDependencies.push('cordova/volume');
postInitDependencies.push('cordova/chromecast');
postInitDependencies.push('cordova/orientation');
postInitDependencies.push('cordova/remotecontrols');
//postInitDependencies.push('cordova/ios/backgroundfetch');
//postInitDependencies.push('cordova/backgroundfetch');
}
} else if (browserInfo.chrome) {