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 script loading

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-19 15:15:40 -04:00
parent 463ad6cfb1
commit bbdbdf346e
92 changed files with 1062 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/thirdparty/apiclient/apiclient.js vendored
View file

@ -345,7 +345,7 @@
return url;
};
self.enableAutomaticNetworking = function (server, connectionMode) {
self.enableAutomaticNetworking = function (server, connectionMode, serverUrl) {
logger.log('Begin enableAutomaticNetworking');
@ -353,12 +353,8 @@
self.connectionMode = connectionMode;
self.enableAutomaticNetwork = true;
var url = connectionMode == MediaBrowser.ConnectionMode.Local ?
self.serverInfo().LocalAddress :
self.serverInfo().RemoteAddress;
logger.log('Setting server address to ' + url);
self.serverAddress(url);
logger.log('Setting server address to ' + serverUrl);
self.serverAddress(serverUrl);
};
self.isWebSocketSupported = function () {
@ -570,12 +566,12 @@
return self.ajax({
type: "POST",
url: url
}).done(done);
}).always(done);
}
var deferred = DeferredBuilder.Deferred();
deferred.resolveWith(null, []);
return deferred.promise().done(done);
return deferred.promise().always(done);
};
function getRemoteImagePrefix(options) {

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

@ -479,6 +479,7 @@
for (var j = 0, numServers = servers.length; j < numServers; j++) {
var server = servers[j];
server.UserId = null;
server.AccessToken = null;
server.ExchangeToken = null;
@ -902,7 +903,7 @@
MediaBrowser.ConnectionState.ServerSignIn;
result.Servers.push(server);
result.ApiClient.enableAutomaticNetworking(server, connectionMode);
result.ApiClient.enableAutomaticNetworking(server, connectionMode, self.getServerAddress(server, connectionMode));
if (result.State == MediaBrowser.ConnectionState.SignedIn) {
afterConnected(result.ApiClient, options);
@ -947,6 +948,11 @@
address = normalizeAddress(address);
function onFail() {
logger.log('connectToAddress ' + address + ' failed');
resolveWithFailure(deferred);
}
tryConnect(address, 15000).done(function (publicInfo) {
logger.log('connectToAddress ' + address + ' succeeded');
@ -961,13 +967,9 @@
deferred.resolveWith(null, [result]);
});
}).fail(onFail);
}).fail(function () {
logger.log('connectToAddress ' + address + ' failed');
resolveWithFailure(deferred);
});
}).fail(onFail);
return deferred.promise();
};