milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rework collection editor

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-15 23:55:26 -04:00
parent 39d4daa2fb
commit 0e1c7cbb7a
21 changed files with 436 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/apiclient/fileupload.js
View file

@ -4,7 +4,7 @@
var self = this;
self.upload = function (file, mimeType, name, url) {
self.upload = function (file, name, url) {
var deferred = DeferredBuilder.Deferred();

14
dashboard-ui/apiclient/localassetmanager.js
View file

@ -12,6 +12,12 @@
return deferred.promise();
}
function deleteOfflineUser(id) {
var deferred = DeferredBuilder.Deferred();
deferred.resolve();
return deferred.promise();
}
function getCameraPhotos() {
var deferred = DeferredBuilder.Deferred();
deferred.resolveWith(null, [[]]);
@ -24,6 +30,12 @@
return deferred.promise();
}
function deleteOfflineActions(actions) {
var deferred = DeferredBuilder.Deferred();
deferred.resolveWith(null, [[]]);
return deferred.promise();
}
function getServerItemIds(serverId) {
var deferred = DeferredBuilder.Deferred();
deferred.resolveWith(null, [[]]);
@ -86,8 +98,10 @@
window.LocalAssetManager = {
getLocalMediaSource: getLocalMediaSource,
saveOfflineUser: saveOfflineUser,
deleteOfflineUser: deleteOfflineUser,
getCameraPhotos: getCameraPhotos,
getOfflineActions: getOfflineActions,
deleteOfflineActions: deleteOfflineActions,
getServerItemIds: getServerItemIds,
removeLocalItem: removeLocalItem,
getLocalItem: getLocalItem,

5
dashboard-ui/apiclient/sync/contentuploader.js
View file

@ -113,10 +113,7 @@
Logger.log('Uploading file to ' + url);
// TODO: Need to get this from cordova file api instead of trying to infer the content type from the path
var mimeType = file.toLowerCase().indexOf('mp4') != -1 || file.toLowerCase().indexOf('m4v') != -1 ? 'video/mp4' : (file.toLowerCase().indexOf('png') != -1 ? 'image/png' : 'image/jpg');
new MediaBrowser.FileUpload().upload(file, mimeType, name, url).done(function () {
new MediaBrowser.FileUpload().upload(file, name, url).done(function () {
Logger.log('File upload succeeded');
deferred.resolve();

18
dashboard-ui/apiclient/sync/mediasync.js
View file

@ -49,7 +49,11 @@
apiClient.reportOfflineActions(actions).done(function () {
deferred.resolve();
LocalAssetManager.deleteOfflineActions(actions).done(function () {
deferred.resolve();
}).fail(getOnFail(deferred));
}).fail(getOnFail(deferred));
@ -235,9 +239,9 @@
Logger.log('Downloading media. Url: ' + url + '. Local path: ' + localPath);
localAssetManager.downloadFile(url, localPath).done(function () {
LocalAssetManager.downloadFile(url, localPath).done(function () {
localAssetManager.addOrUpdateLocalItem(localItem).done(function () {
LocalAssetManager.addOrUpdateLocalItem(localItem).done(function () {
deferred.resolve();
@ -324,7 +328,7 @@
require(['localassetmanager'], function () {
localAssetManager.hasImage(serverId, itemId, imageTag).done(function (hasImage) {
LocalAssetManager.hasImage(serverId, itemId, imageTag).done(function (hasImage) {
if (hasImage) {
deferred.resolve();
@ -336,7 +340,7 @@
ImageType: imageType
});
localAssetManager.downloadImage(imageUrl, serverId, itemId, imageTag).done(function () {
LocalAssetManager.downloadImage(imageUrl, serverId, itemId, imageTag).done(function () {
deferred.resolve();
@ -418,7 +422,7 @@
LocalAssetManager.downloadSubtitles(url, localItem, subtitleStream).done(function (subtitlePath) {
subtitleStream.Path = subtitlePath;
localAssetManager.addOrUpdateLocalItem(localItem).done(function () {
LocalAssetManager.addOrUpdateLocalItem(localItem).done(function () {
deferred.resolve();
}).fail(getOnFail(deferred));
@ -479,7 +483,7 @@
else {
localItem.UserIdsWithAccess = userIdsWithAccess;
localAssetManager.addOrUpdateLocalItem(localItem).done(function () {
LocalAssetManager.addOrUpdateLocalItem(localItem).done(function () {
deferred.resolve();
}).fail(getOnFail(deferred));
}

12
dashboard-ui/apiclient/sync/offlineusersync.js
View file

@ -48,7 +48,17 @@
});
}).fail(function () {
deferred.reject();
// TODO: We should only delete if there's a 401 response
require(['localassetmanager'], function () {
LocalAssetManager.deleteOfflineUser(user.Id).done(function () {
deferred.resolve();
}).fail(function () {
deferred.resolve();
});
});
});
return deferred.promise();