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

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.106", "version": "1.1.107",
"_release": "1.1.106", "_release": "1.1.107",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.106", "tag": "1.1.107",
"commit": "2bed46ebe6ee1e213b5f89476ca8c285937ba343" "commit": "82a9be9ffc4359043cbbae83031491dc4d2182cc"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

15
dashboard-ui/bower_components/emby-apiclient/cameraroll.js vendored Normal file
View file

@ -0,0 +1,15 @@
define([], function () {
'use strict';
function CameraRoll() {
}
CameraRoll.prototype.getFiles = function () {
return Promise.resolve([]);
};
return new CameraRoll();
});

6
dashboard-ui/bower_components/emby-apiclient/localassetmanager.js vendored
View file

@ -23,11 +23,6 @@
return userrepository.remove(id); return userrepository.remove(id);
} }
//TODO:
function getCameraPhotos() {
return Promise.resolve([]);
}
function recordUserAction(action) { function recordUserAction(action) {
action.Id = createGuid(); action.Id = createGuid();
@ -454,7 +449,6 @@
getLocalItem: getLocalItem, getLocalItem: getLocalItem,
saveOfflineUser: saveOfflineUser, saveOfflineUser: saveOfflineUser,
deleteOfflineUser: deleteOfflineUser, deleteOfflineUser: deleteOfflineUser,
getCameraPhotos: getCameraPhotos,
recordUserAction: recordUserAction, recordUserAction: recordUserAction,
getUserActions: getUserActions, getUserActions: getUserActions,
deleteUserAction: deleteUserAction, deleteUserAction: deleteUserAction,

5
dashboard-ui/bower_components/emby-apiclient/nullassetmanager.js vendored
View file

@ -17,10 +17,6 @@
return Promise.resolve(); return Promise.resolve();
} }
function getCameraPhotos() {
return Promise.resolve([]);
}
function recordUserAction(action) { function recordUserAction(action) {
return Promise.resolve(); return Promise.resolve();
} }
@ -110,7 +106,6 @@
getLocalItem: getLocalItem, getLocalItem: getLocalItem,
saveOfflineUser: saveOfflineUser, saveOfflineUser: saveOfflineUser,
deleteOfflineUser: deleteOfflineUser, deleteOfflineUser: deleteOfflineUser,
getCameraPhotos: getCameraPhotos,
recordUserAction: recordUserAction, recordUserAction: recordUserAction,
getUserActions: getUserActions, getUserActions: getUserActions,
deleteUserAction: deleteUserAction, deleteUserAction: deleteUserAction,

4
dashboard-ui/bower_components/emby-apiclient/sync/contentuploader.js vendored
View file

@ -1,4 +1,4 @@
define(['localassetmanager'], function (localAssetManager) { define(['localassetmanager', 'cameraRoll'], function (localAssetManager, cameraRoll) {
'use strict'; 'use strict';
return function (connectionManager) { return function (connectionManager) {
@ -7,7 +7,7 @@
self.uploadImages = function (server) { self.uploadImages = function (server) {
return LocalAssetManager.getCameraPhotos().then(function (photos) { return cameraRoll.getFiles().then(function (photos) {
if (!photos.length) { if (!photos.length) {
return Promise.resolve(); return Promise.resolve();

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.405", "version": "1.4.406",
"_release": "1.4.405", "_release": "1.4.406",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.405", "tag": "1.4.406",
"commit": "6745a06a14f978824ceaf9cebdb07f8bca2677e1" "commit": "5ef7b315244a1804f2892269a42db94a52a86ea8"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

4
dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js vendored
View file

@ -42,7 +42,7 @@ define(['globalize', 'loading', 'alert'], function (globalize, loading, alert) {
loading.hide(); loading.hide();
if (response.status == 404) { if (response.status === 404) {
// User doesn't exist // User doesn't exist
alert({ alert({
text: globalize.translate('GuestUserNotFound') text: globalize.translate('GuestUserNotFound')
@ -138,7 +138,7 @@ define(['globalize', 'loading', 'alert'], function (globalize, loading, alert) {
}); });
} }
else if (currentConnectUsername != enteredConnectUsername) { else if (currentConnectUsername !== enteredConnectUsername) {
// Add/Update connect info // Add/Update connect info
return apiClient.ajax({ return apiClient.ajax({

2
dashboard-ui/bower_components/emby-webcomponents/sync/syncjoblist.js vendored
View file

@ -218,7 +218,7 @@ globalize.translate('sharedcomponents#CancelSyncJobConfirmation');
options.ExcludeTargetIds = apiClient.deviceId(); options.ExcludeTargetIds = apiClient.deviceId();
} }
return apiClient.getJSON(ApiClient.getUrl('Sync/Jobs', options)).then(function (response) { return apiClient.getJSON(apiClient.getUrl('Sync/Jobs', options)).then(function (response) {
renderList(listInstance, response.Items); renderList(listInstance, response.Items);
loading.hide(); loading.hide();

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

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