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 sync objects

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-06 22:56:32 -04:00
parent 866ecf78b4
commit c71f597c58
14 changed files with 250 additions and 435 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.72", "version": "1.1.73",
"_release": "1.1.72", "_release": "1.1.73",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.72", "tag": "1.1.73",
"commit": "674ebfd2c3ad177d4b39025573c55920b8f69d03" "commit": "3b108b8da07b5b715fe616f1528ad95acd15e061"
}, },
"_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",

20
dashboard-ui/bower_components/emby-apiclient/fileupload.js vendored
View file

@ -1,22 +1,12 @@
(function (globalScope) { define([], function () {
function fileUpload() { return function () {
var self = this; var self = this;
self.upload = function (file, name, url) { self.upload = function (file, name, url) {
return new Promise(function (resolve, reject) { return Promise.reject();
reject();
});
}; };
} };
});
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
globalScope.MediaBrowser.FileUpload = fileUpload;
})(this);

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

@ -1,113 +1,77 @@
(function () { define([], function () {
function getLocalMediaSource(serverId, itemId) { function getLocalMediaSource(serverId, itemId) {
return new Promise(function (resolve, reject) { return Promise.resolve(null);
resolve(null);
});
} }
function saveOfflineUser(user) { function saveOfflineUser(user) {
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
function deleteOfflineUser(id) { function deleteOfflineUser(id) {
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
function getCameraPhotos() { function getCameraPhotos() {
return new Promise(function (resolve, reject) { return Promise.resolve([]);
resolve([]);
});
} }
function getOfflineActions(serverId) { function getOfflineActions(serverId) {
return new Promise(function (resolve, reject) { return Promise.resolve([]);
resolve([]);
});
} }
function deleteOfflineActions(actions) { function deleteOfflineActions(actions) {
return new Promise(function (resolve, reject) { return Promise.resolve([]);
resolve([]);
});
} }
function getServerItemIds(serverId) { function getServerItemIds(serverId) {
return new Promise(function (resolve, reject) { return Promise.resolve([]);
resolve([]);
});
} }
function removeLocalItem(itemId, serverId) { function removeLocalItem(itemId, serverId) {
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
function getLocalItem(itemId, serverId) { function getLocalItem(itemId, serverId) {
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
function addOrUpdateLocalItem(localItem) { function addOrUpdateLocalItem(localItem) {
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
function createLocalItem(libraryItem, serverInfo, originalFileName) { function createLocalItem(libraryItem, serverInfo, originalFileName) {
return new Promise(function (resolve, reject) { return Promise.resolve({});
resolve({});
});
} }
function downloadFile(url, localPath) { function downloadFile(url, localPath) {
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
function downloadSubtitles(url, localItem, subtitleStreamh) { function downloadSubtitles(url, localItem, subtitleStreamh) {
return new Promise(function (resolve, reject) { return Promise.resolve('');
resolve("");
});
} }
function hasImage(serverId, itemId, imageTag) { function hasImage(serverId, itemId, imageTag) {
return new Promise(function (resolve, reject) { return Promise.resolve(false);
resolve(false);
});
} }
function downloadImage(url, serverId, itemId, imageTag) { function downloadImage(url, serverId, itemId, imageTag) {
return new Promise(function (resolve, reject) { return Promise.resolve(false);
resolve(false);
});
} }
function fileExists(path) { function fileExists(path) {
return Promise.resolve(false);
return new Promise(function (resolve, reject) {
resolve(false);
});
} }
function translateFilePath(path) { function translateFilePath(path) {
return Promise.resolve(path);
return new Promise(function (resolve, reject) {
resolve(path);
});
} }
window.LocalAssetManager = { return {
getLocalMediaSource: getLocalMediaSource, getLocalMediaSource: getLocalMediaSource,
saveOfflineUser: saveOfflineUser, saveOfflineUser: saveOfflineUser,
deleteOfflineUser: deleteOfflineUser, deleteOfflineUser: deleteOfflineUser,
@ -126,5 +90,4 @@
fileExists: fileExists, fileExists: fileExists,
translateFilePath: translateFilePath translateFilePath: translateFilePath
}; };
});
})();

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

@ -1,39 +1,35 @@
(function (globalScope) { define(['localassetmanager'], function (localAssetManager) {
function contentUploader(connectionManager) { return function (connectionManager) {
var self = this; var self = this;
self.uploadImages = function (server) { self.uploadImages = function (server) {
var deferred = DeferredBuilder.Deferred(); return LocalAssetManager.getCameraPhotos().then(function (photos) {
LocalAssetManager.getCameraPhotos().then(function (photos) {
if (!photos.length) { if (!photos.length) {
deferred.resolve(); return Promise.resolve();
return;
} }
var apiClient = connectionManager.getApiClient(server.Id); var apiClient = connectionManager.getApiClient(server.Id);
apiClient.getContentUploadHistory().then(function (uploadHistory) { return apiClient.getContentUploadHistory().then(function (uploadHistory) {
photos = getFilesToUpload(photos, uploadHistory); photos = getFilesToUpload(photos, uploadHistory);
console.log('Found ' + photos.length + ' files to upload'); console.log('Found ' + photos.length + ' files to upload');
uploadNext(photos, 0, server, apiClient, deferred); return new Promise(function (resolve, reject) {
}, function () { uploadNext(photos, 0, server, apiClient, resolve, reject);
deferred.reject();
}); });
}, function () { }, function () {
deferred.reject(); return Promise.resolve();
}); });
return deferred.promise(); });
}; };
function getFilesToUpload(files, uploadHistory) { function getFilesToUpload(files, uploadHistory) {
@ -57,29 +53,29 @@
return CryptoJS.SHA1(file + "1").toString(); return CryptoJS.SHA1(file + "1").toString();
} }
function uploadNext(files, index, server, apiClient, deferred) { function uploadNext(files, index, server, apiClient, resolve, reject) {
var length = files.length; var length = files.length;
if (index >= length) { if (index >= length) {
deferred.resolve(); resolve();
return; return;
} }
uploadFile(files[index], apiClient).then(function () { uploadFile(files[index], apiClient).then(function () {
uploadNext(files, index + 1, server, apiClient, deferred); uploadNext(files, index + 1, server, apiClient, resolve, reject);
}, function () { }, function () {
uploadNext(files, index + 1, server, apiClient, deferred); uploadNext(files, index + 1, server, apiClient, resolve, reject);
}); });
} }
function uploadFile(file, apiClient) { function uploadFile(file, apiClient) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
require(['fileupload', "cryptojs-sha1"], function () { require(['fileupload', "cryptojs-sha1"], function (FileUpload) {
var name = 'camera image ' + new Date().getTime(); var name = 'camera image ' + new Date().getTime();
@ -93,26 +89,9 @@
console.log('Uploading file to ' + url); console.log('Uploading file to ' + url);
new MediaBrowser.FileUpload().upload(file, name, url).then(function () { new FileUpload().upload(file, name, url).then(resolve, reject);
console.log('File upload succeeded');
deferred.resolve();
}, function () {
console.log('File upload failed');
deferred.reject();
}); });
}); });
return deferred.promise();
} }
} };
});
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
globalScope.MediaBrowser.ContentUploader = contentUploader;
})(this);

99
dashboard-ui/bower_components/emby-apiclient/sync/mediasync.js vendored
View file

@ -1,66 +1,41 @@
(function (globalScope) { define(['localassetmanager'], function (LocalAssetManager) {
function mediaSync() { return function () {
var self = this; var self = this;
self.sync = function (apiClient, serverInfo, options) { self.sync = function (apiClient, serverInfo, options) {
var deferred = DeferredBuilder.Deferred(); return reportOfflineActions(apiClient, serverInfo).then(function () {
reportOfflineActions(apiClient, serverInfo).then(function () {
// Do the first data sync // Do the first data sync
syncData(apiClient, serverInfo, false).then(function () { return syncData(apiClient, serverInfo, false).then(function () {
// Download new content // Download new content
getNewMedia(apiClient, serverInfo, options).then(function () { return getNewMedia(apiClient, serverInfo, options).then(function () {
// Do the second data sync // Do the second data sync
syncData(apiClient, serverInfo, false).then(function () { return syncData(apiClient, serverInfo, false);
});
deferred.resolve(); });
});
}, getOnFail(deferred));
}, getOnFail(deferred));
}, getOnFail(deferred));
}, getOnFail(deferred));
return deferred.promise();
}; };
function reportOfflineActions(apiClient, serverInfo) { function reportOfflineActions(apiClient, serverInfo) {
console.log('Begin reportOfflineActions'); console.log('Begin reportOfflineActions');
var deferred = DeferredBuilder.Deferred(); return LocalAssetManager.getOfflineActions(serverInfo.Id).then(function (actions) {
require(['localassetmanager'], function () {
LocalAssetManager.getOfflineActions(serverInfo.Id).then(function (actions) {
if (!actions.length) { if (!actions.length) {
deferred.resolve(); return Promise.resolve();
return;
} }
apiClient.reportOfflineActions(actions).then(function () { return apiClient.reportOfflineActions(actions).then(function () {
LocalAssetManager.deleteOfflineActions(actions).then(function () { return LocalAssetManager.deleteOfflineActions(actions);
});
deferred.resolve();
}, getOnFail(deferred));
}, getOnFail(deferred));
}, getOnFail(deferred));
}); });
return deferred.promise();
} }
function syncData(apiClient, serverInfo, syncUserItemAccess) { function syncData(apiClient, serverInfo, syncUserItemAccess) {
@ -69,8 +44,6 @@
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
require(['localassetmanager'], function () {
LocalAssetManager.getServerItemIds(serverInfo.Id).then(function (localIds) { LocalAssetManager.getServerItemIds(serverInfo.Id).then(function (localIds) {
var request = { var request = {
@ -86,7 +59,6 @@
}, getOnFail(deferred)); }, getOnFail(deferred));
}, getOnFail(deferred)); }, getOnFail(deferred));
});
return deferred.promise(); return deferred.promise();
} }
@ -146,18 +118,7 @@
console.log('Begin removeLocalItem'); console.log('Begin removeLocalItem');
var deferred = DeferredBuilder.Deferred(); return LocalAssetManager.removeLocalItem(itemId, serverId);
require(['localassetmanager'], function () {
LocalAssetManager.removeLocalItem(itemId, serverId).then(function (localIds) {
deferred.resolve();
}, getOnFail(deferred));
});
return deferred.promise();
} }
function getNewMedia(apiClient, serverInfo, options) { function getNewMedia(apiClient, serverInfo, options) {
@ -203,8 +164,6 @@
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
require(['localassetmanager'], function () {
var libraryItem = jobItem.Item; var libraryItem = jobItem.Item;
LocalAssetManager.createLocalItem(libraryItem, serverInfo, jobItem.OriginalFileName).then(function (localItem) { LocalAssetManager.createLocalItem(libraryItem, serverInfo, jobItem.OriginalFileName).then(function (localItem) {
@ -232,7 +191,6 @@
}, getOnFail(deferred)); }, getOnFail(deferred));
}, getOnFail(deferred)); }, getOnFail(deferred));
});
return deferred.promise(); return deferred.promise();
} }
@ -242,8 +200,6 @@
console.log('Begin downloadMedia'); console.log('Begin downloadMedia');
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
require(['localassetmanager'], function () {
var url = apiClient.getUrl("Sync/JobItems/" + jobItem.SyncJobItemId + "/File", { var url = apiClient.getUrl("Sync/JobItems/" + jobItem.SyncJobItemId + "/File", {
api_key: apiClient.accessToken() api_key: apiClient.accessToken()
}); });
@ -268,8 +224,6 @@
}, getOnFail(deferred)); }, getOnFail(deferred));
});
return deferred.promise(); return deferred.promise();
} }
@ -350,8 +304,6 @@
console.log('Begin downloadImage'); console.log('Begin downloadImage');
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
require(['localassetmanager'], function () {
LocalAssetManager.hasImage(serverId, itemId, imageTag).then(function (hasImage) { LocalAssetManager.hasImage(serverId, itemId, imageTag).then(function (hasImage) {
if (hasImage) { if (hasImage) {
@ -372,7 +324,6 @@
}, getOnFail(deferred)); }, getOnFail(deferred));
}); });
});
return deferred.promise(); return deferred.promise();
} }
@ -382,8 +333,6 @@
console.log('Begin getSubtitles'); console.log('Begin getSubtitles');
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
require(['localassetmanager'], function () {
if (!jobItem.Item.MediaSources.length) { if (!jobItem.Item.MediaSources.length) {
console.log("Cannot download subtitles because video has no media source info."); console.log("Cannot download subtitles because video has no media source info.");
deferred.resolve(); deferred.resolve();
@ -397,7 +346,6 @@
var mediaSource = jobItem.Item.MediaSources[0]; var mediaSource = jobItem.Item.MediaSources[0];
getNextSubtitle(files, 0, apiClient, jobItem, localItem, mediaSource, deferred); getNextSubtitle(files, 0, apiClient, jobItem, localItem, mediaSource, deferred);
});
return deferred.promise(); return deferred.promise();
} }
@ -443,8 +391,6 @@
api_key: apiClient.accessToken() api_key: apiClient.accessToken()
}); });
require(['localassetmanager'], function () {
LocalAssetManager.downloadSubtitles(url, localItem, subtitleStream).then(function (subtitlePath) { LocalAssetManager.downloadSubtitles(url, localItem, subtitleStream).then(function (subtitlePath) {
subtitleStream.Path = subtitlePath; subtitleStream.Path = subtitlePath;
@ -453,7 +399,6 @@
}, getOnFail(deferred)); }, getOnFail(deferred));
}, getOnFail(deferred)); }, getOnFail(deferred));
});
return deferred.promise(); return deferred.promise();
} }
@ -496,8 +441,6 @@
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
require(['localassetmanager'], function () {
LocalAssetManager.getUserIdsWithAccess(itemId, serverId).then(function (savedUserIdsWithAccess) { LocalAssetManager.getUserIdsWithAccess(itemId, serverId).then(function (savedUserIdsWithAccess) {
var userIdsWithAccess = syncDataResult.ItemUserAccess[itemId]; var userIdsWithAccess = syncDataResult.ItemUserAccess[itemId];
@ -514,7 +457,6 @@
} }
}, getOnFail(deferred)); }, getOnFail(deferred));
});
return deferred.promise(); return deferred.promise();
} }
@ -525,12 +467,5 @@
deferred.reject(); deferred.reject();
}; };
} }
} };
});
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
globalScope.MediaBrowser.MediaSync = mediaSync;
})(this);

46
dashboard-ui/bower_components/emby-apiclient/sync/multiserversync.js vendored
View file

@ -1,20 +1,6 @@
(function (globalScope) { define(['serversync'], function (ServerSync) {
function multiServerSync(connectionManager) { function syncNext(connectionManager, servers, index, options, resolve, reject) {
var self = this;
self.sync = function (options) {
return new Promise(function (resolve, reject) {
var servers = connectionManager.getSavedServers();
syncNext(servers, 0, options, resolve, reject);
});
};
function syncNext(servers, index, options, resolve, reject) {
var length = servers.length; var length = servers.length;
@ -28,24 +14,28 @@
console.log("Creating ServerSync to server: " + server.Id); console.log("Creating ServerSync to server: " + server.Id);
require(['serversync'], function () { new ServerSync(connectionManager).sync(server, options).then(function () {
new MediaBrowser.ServerSync(connectionManager).sync(server, options).then(function () { syncNext(connectionManager, servers, index + 1, options, resolve, reject);
syncNext(servers, index + 1, options, resolve, reject);
}, function () { }, function () {
syncNext(servers, index + 1, options, resolve, reject); syncNext(connectionManager, servers, index + 1, options, resolve, reject);
});
}); });
} }
}
if (!globalScope.MediaBrowser) { return function (connectionManager) {
globalScope.MediaBrowser = {};
}
globalScope.MediaBrowser.MultiServerSync = multiServerSync; var self = this;
})(this); self.sync = function (options) {
return new Promise(function (resolve, reject) {
var servers = connectionManager.getSavedServers();
syncNext(connectionManager, servers, 0, options, resolve, reject);
});
};
};
});

48
dashboard-ui/bower_components/emby-apiclient/sync/offlineusersync.js vendored
View file

@ -1,17 +1,4 @@
(function (globalScope) { define(['localassetmanager'], function (localAssetManager) {
function offlineUserSync() {
var self = this;
self.sync = function (apiClient, server) {
return new Promise(function (resolve, reject) {
var users = server.Users || [];
syncNext(users, 0, resolve, reject, apiClient, server);
});
};
function syncNext(users, index, resolve, reject, apiClient, server) { function syncNext(users, index, resolve, reject, apiClient, server) {
@ -32,33 +19,30 @@
function syncUser(user, apiClient) { function syncUser(user, apiClient) {
return new Promise(function (resolve, reject) { return apiClient.getOfflineUser(user.Id).then(function (result) {
apiClient.getOfflineUser(user.Id).then(function (result) { return localAssetManager.saveOfflineUser(result);
require(['localassetmanager'], function () {
LocalAssetManager.saveOfflineUser(result).then(resolve, resolve);
});
}, function () { }, function () {
// TODO: We should only delete if there's a 401 response // TODO: We should only delete if there's a 401 response
return localAssetManager.deleteOfflineUser(user.Id).catch(function () {
require(['localassetmanager'], function () { return Promise.resolve();
LocalAssetManager.deleteOfflineUser(user.Id).then(resolve, resolve);
});
}); });
}); });
} }
} return function offlineUserSync() {
if (!globalScope.MediaBrowser) { var self = this;
globalScope.MediaBrowser = {};
}
globalScope.MediaBrowser.OfflineUserSync = offlineUserSync; self.sync = function (apiClient, server) {
})(this); return new Promise(function (resolve, reject) {
var users = server.Users || [];
syncNext(users, 0, resolve, reject, apiClient, server);
});
};
};
});

50
dashboard-ui/bower_components/emby-apiclient/sync/serversync.js vendored
View file

@ -1,6 +1,6 @@
(function (globalScope) { define([], function () {
function serverSync(connectionManager) { return function (connectionManager) {
var self = this; var self = this;
@ -9,10 +9,7 @@
if (!server.AccessToken && !server.ExchangeToken) { if (!server.AccessToken && !server.ExchangeToken) {
console.log('Skipping sync to server ' + server.Id + ' because there is no saved authentication information.'); console.log('Skipping sync to server ' + server.Id + ' because there is no saved authentication information.');
return new Promise(function (resolve, reject) { return Promise.resolve();
resolve();
});
} }
var connectionOptions = { var connectionOptions = {
@ -55,9 +52,9 @@
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['contentuploader'], function () { require(['contentuploader'], function (ContentUploader) {
new MediaBrowser.ContentUploader(connectionManager).uploadImages(server).then(function () { new ContentUploader(connectionManager).uploadImages(server).then(function () {
console.log("ContentUploaded succeeded to server: " + server.Id); console.log("ContentUploaded succeeded to server: " + server.Id);
@ -81,22 +78,17 @@
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['offlineusersync'], function () { require(['offlineusersync'], function (OfflineUserSync) {
var apiClient = connectionManager.getApiClient(server.Id); var apiClient = connectionManager.getApiClient(server.Id);
new MediaBrowser.OfflineUserSync().sync(apiClient, server).then(function () { new OfflineUserSync().sync(apiClient, server).then(function () {
console.log("OfflineUserSync succeeded to server: " + server.Id); console.log("OfflineUserSync succeeded to server: " + server.Id);
syncMedia(server, options).then(resolve, reject); syncMedia(server, options).then(resolve, reject);
}, function () { }, reject);
console.log("OfflineUserSync failed to server: " + server.Id);
reject();
});
}); });
}); });
} }
@ -105,31 +97,13 @@
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['mediasync'], function () { require(['mediasync'], function (MediaSync) {
var apiClient = connectionManager.getApiClient(server.Id); var apiClient = connectionManager.getApiClient(server.Id);
new MediaBrowser.MediaSync().sync(apiClient, server, options).then(function () { new MediaSync().sync(apiClient, server, options).then(resolve, reject);
console.log("MediaSync succeeded to server: " + server.Id);
resolve();
}, function () {
console.log("MediaSync failed to server: " + server.Id);
reject();
});
}); });
}); });
} }
} };
});
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
globalScope.MediaBrowser.ServerSync = serverSync;
})(this);

6
dashboard-ui/bower_components/iron-icon/.bower.json vendored
View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-icon", "homepage": "https://github.com/polymerelements/iron-icon",
"_release": "1.0.9", "_release": "1.0.9",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.9", "tag": "v1.0.9",
"commit": "f6fb241901377e30e2c9c6cd47e3e8e8beb6574d" "commit": "f6fb241901377e30e2c9c6cd47e3e8e8beb6574d"
}, },
"_source": "git://github.com/PolymerElements/iron-icon.git", "_source": "git://github.com/polymerelements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-icon" "_originalSource": "polymerelements/iron-icon"
} }

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

6
dashboard-ui/bower_components/polymer/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

4
dashboard-ui/scripts/mediacontroller.js
View file

@ -932,7 +932,7 @@
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['localassetmanager'], function () { require(['localassetmanager'], function (LocalAssetManager) {
var serverInfo = ApiClient.serverInfo(); var serverInfo = ApiClient.serverInfo();
@ -1045,7 +1045,7 @@
if (mediaSource.Protocol == 'File') { if (mediaSource.Protocol == 'File') {
require(['localassetmanager'], function () { require(['localassetmanager'], function (LocalAssetManager) {
LocalAssetManager.fileExists(mediaSource.Path).then(function (exists) { LocalAssetManager.fileExists(mediaSource.Path).then(function (exists) {
console.log('LocalAssetManager.fileExists: path: ' + mediaSource.Path + ' result: ' + exists); console.log('LocalAssetManager.fileExists: path: ' + mediaSource.Path + ' result: ' + exists);

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -614,7 +614,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
if (playMethod == 'DirectPlay' && mediaSource.Protocol == 'File') { if (playMethod == 'DirectPlay' && mediaSource.Protocol == 'File') {
require(['localassetmanager'], function () { require(['localassetmanager'], function (LocalAssetManager) {
LocalAssetManager.translateFilePath(resultInfo.url).then(function (path) { LocalAssetManager.translateFilePath(resultInfo.url).then(function (path) {

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

@ -1566,11 +1566,11 @@ var AppInfo = {};
} }
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
define("localassetmanager", ["cordova/localassetmanager"]); define("localassetmanager", ["cordova/localassetmanager"], returnFirstDependency);
define("fileupload", ["cordova/fileupload"]); define("fileupload", ["cordova/fileupload"], returnFirstDependency);
} else { } else {
define("localassetmanager", [apiClientBowerPath + "/localassetmanager"]); define("localassetmanager", [apiClientBowerPath + "/localassetmanager"], returnFirstDependency);
define("fileupload", [apiClientBowerPath + "/fileupload"]); define("fileupload", [apiClientBowerPath + "/fileupload"], returnFirstDependency);
} }
define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]); define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]);