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

consolidate scripts

Browse source
This commit is contained in:
Luke Pulverenti 2015-02-15 23:00:33 -05:00
parent 74e42d4a6d
commit c4dc3c6851
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -691,21 +691,12 @@
return (str1 || '').toLowerCase() == (str2 || '').toLowerCase(); 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) { function testNextConnectionMode(tests, index, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred) {
if (index >= tests.length) { if (index >= tests.length) {
onFailedConnection(deferred); logger.log('Tested all connection modes. Failing server connection.');
resolveWithFailure(deferred);
return; return;
} }
@ -741,10 +732,13 @@
tryConnect(address, timeout).done(function (result) { tryConnect(address, timeout).done(function (result) {
logger.log('calling onSuccessfulConnection with connection mode ' + mode + ' with server ' + server.Name);
onSuccessfulConnection(server, result, mode, options, deferred); onSuccessfulConnection(server, result, mode, options, deferred);
}).fail(function () { }).fail(function () {
logger.log('test failed for connection mode ' + mode + ' with server ' + server.Name);
if (enableRetry) { if (enableRetry) {
var sleepTime = 10000 - (new Date().getTime() - wakeOnLanSendTime); var sleepTime = 10000 - (new Date().getTime() - wakeOnLanSendTime);
@ -754,9 +748,9 @@
testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred); testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred);
} else { } else {
testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred);
} }
testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred);
}); });
} }
@ -861,9 +855,6 @@
deferred.resolveWith(null, [result]); deferred.resolveWith(null, [result]);
}).fail(function () {
resolveWithFailure(deferred);
}); });
}).fail(function () { }).fail(function () {