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

merge from dev

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,28 +14,28 @@
return syncPromise.promise();
}
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
require(['multiserversync'], function () {
require(['multiserversync'], function () {
options = options || {};
options = options || {};
LocalSync.normalizeSyncOptions(options);
LocalSync.normalizeSyncOptions(options);
options.cameraUploadServers = AppSettings.cameraUploadServers();
options.cameraUploadServers = AppSettings.cameraUploadServers();
syncPromise = new MediaBrowser.MultiServerSync(ConnectionManager).sync(options).done(function () {
syncPromise = new MediaBrowser.MultiServerSync(ConnectionManager).sync(options).then(function () {
syncPromise = null;
deferred.resolve();
syncPromise = null;
resolve();
}).fail(function () {
}, function () {
syncPromise = null;
syncPromise = null;
});
});
});
return deferred.promise();
});
},
normalizeSyncOptions: function (options) {