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 Deferred, fix typos

Browse source
This commit is contained in:
Luke Pulverenti 2015-02-15 22:05:21 -05:00
parent f7bb1a627d
commit 74e42d4a6d
4 changed files with 341 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

42
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -5,7 +5,7 @@
}
globalScope.MediaBrowser.ConnectionState = {
Unavilable: 0,
Unavailable: 0,
ServerSelection: 1,
ServerSignIn: 2,
SignedIn: 3,
@ -38,8 +38,8 @@
deferred.resolveWith(null, [
{
state: MediaBrowser.ConnectionState.Unavilable,
connectUser: self.connectUser()
State: MediaBrowser.ConnectionState.Unavailable,
ConnectUser: self.connectUser()
}]);
}
@ -229,7 +229,7 @@
function ensureConnectUser(credentials) {
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
if (connectUser && connectUser.Id == credentials.ConnectUserId) {
deferred.resolveWith(null, [[]]);
@ -313,7 +313,7 @@
function validateAuthentication(server, connectionMode) {
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress;
@ -395,7 +395,7 @@
self.user = function () {
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
var localUser;
@ -454,7 +454,7 @@
}
}
return Deferred.when(promises).done(function () {
return DeferredBuilder.when(promises).done(function () {
var credentials = credentialProvider.credentials();
@ -494,7 +494,7 @@
logger.log('Begin getConnectServers');
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
if (!self.connectToken() || !self.connectUserId()) {
deferred.resolveWith(null, [[]]);
@ -544,7 +544,7 @@
var credentials = credentialProvider.credentials();
var servers = credentials.servers.slice(0);
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
getConnectServers().done(function (result) {
@ -568,7 +568,7 @@
logger.log('Begin connect');
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
var isResolved = false;
if (capabilities.SupportsOfflineAccess) {
@ -602,7 +602,7 @@
logger.log('Begin connectToServers, with ' + servers.length + ' servers');
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
if (servers.length == 1) {
@ -661,11 +661,11 @@
self.connectToServer = function (server, options) {
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
var tests = [];
if (server.LastConnectionMode) {
if (server.LastConnectionMode != null) {
tests.push(server.LastConnectionMode);
}
if (tests.indexOf(MediaBrowser.ConnectionMode.Manual) == -1) { tests.push(MediaBrowser.ConnectionMode.Manual); }
@ -691,11 +691,21 @@
return (str1 || '').toLowerCase() == (str2 || '').toLowerCase();
}
function onFailedConnection(deferred) {
var result = {
State: MediaBrowser.ConnectionState.Unavailable,
ConnectUser: connectUser
};
deferred.resolveWith(null, [result]);
}
function testNextConnectionMode(tests, index, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred) {
if (index >= tests.length) {
OnFailedConnection(response);
onFailedConnection(deferred);
return;
}
@ -727,6 +737,8 @@
return;
}
logger.log('testing connection mode ' + mode + ' with server ' + server.Name);
tryConnect(address, timeout).done(function (result) {
onSuccessfulConnection(server, result, mode, options, deferred);
@ -833,7 +845,7 @@
address = "http://" + address;
}
var deferred = Deferred.Deferred();
var deferred = DeferredBuilder.Deferred();
tryConnect(address, 15000).done(function (publicInfo) {