1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -24,10 +24,10 @@
return;
}
syncUser(users[index], apiClient).done(function () {
syncUser(users[index], apiClient).then(function () {
syncNext(users, index + 1, deferred, apiClient, server);
}).fail(function () {
}, function () {
syncNext(users, index + 1, deferred, apiClient, server);
});
}
@ -36,26 +36,26 @@
var deferred = DeferredBuilder.Deferred();
apiClient.getOfflineUser(user.Id).done(function (result) {
apiClient.getOfflineUser(user.Id).then(function (result) {
require(['localassetmanager'], function () {
LocalAssetManager.saveOfflineUser(result).done(function () {
LocalAssetManager.saveOfflineUser(result).then(function () {
deferred.resolve();
}).fail(function () {
}, function () {
deferred.resolve();
});
});
}).fail(function () {
}, function () {
// TODO: We should only delete if there's a 401 response
require(['localassetmanager'], function () {
LocalAssetManager.deleteOfflineUser(user.Id).done(function () {
LocalAssetManager.deleteOfflineUser(user.Id).then(function () {
deferred.resolve();
}).fail(function () {
}, function () {
deferred.resolve();
});
});