mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fixed sync menu not displaying options
This commit is contained in:
parent
6ba570e062
commit
77578c185f
2 changed files with 38 additions and 4 deletions
|
@ -592,14 +592,15 @@
|
||||||
function findServers() {
|
function findServers() {
|
||||||
|
|
||||||
var deferred = DeferredBuilder.Deferred();
|
var deferred = DeferredBuilder.Deferred();
|
||||||
ServerDiscovery.findServers().done(function (foundServers) {
|
ServerDiscovery.findServers(2000).done(function (foundServers) {
|
||||||
|
|
||||||
var servers = foundServers.map(function (foundServer) {
|
var servers = foundServers.map(function (foundServer) {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
Id: foundServer.Id,
|
Id: foundServer.Id,
|
||||||
LocalAddress: foundServer.Address,
|
LocalAddress: foundServer.Address,
|
||||||
Name: foundServer.Name
|
Name: foundServer.Name,
|
||||||
|
ManualAddress: convertEndpointAddressToManualAddress(foundServer)
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
deferred.resolveWith(null, [servers]);
|
deferred.resolveWith(null, [servers]);
|
||||||
|
@ -607,6 +608,27 @@
|
||||||
return deferred.promise();
|
return deferred.promise();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function convertEndpointAddressToManualAddress(info) {
|
||||||
|
|
||||||
|
if (info.Address && info.EndpointAddress) {
|
||||||
|
var address = info.EndpointAddress.split(":")[0];
|
||||||
|
|
||||||
|
// Determine the port, if any
|
||||||
|
var parts = info.Address.split(":");
|
||||||
|
if (parts.length > 1) {
|
||||||
|
var portString = parts[parts.length - 1];
|
||||||
|
|
||||||
|
if (!isNaN(parseInt(portString))) {
|
||||||
|
address += ":" + portString;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalizeAddress(address);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
self.connect = function () {
|
self.connect = function () {
|
||||||
|
|
||||||
logger.log('Begin connect');
|
logger.log('Begin connect');
|
||||||
|
@ -876,12 +898,19 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
self.connectToAddress = function (address) {
|
function normalizeAddress(address) {
|
||||||
|
|
||||||
if (address.toLowerCase().indexOf('http') != 0) {
|
if (address.toLowerCase().indexOf('http') != 0) {
|
||||||
address = "http://" + address;
|
address = "http://" + address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return address;
|
||||||
|
}
|
||||||
|
|
||||||
|
self.connectToAddress = function (address) {
|
||||||
|
|
||||||
|
address = normalizeAddress(address);
|
||||||
|
|
||||||
var deferred = DeferredBuilder.Deferred();
|
var deferred = DeferredBuilder.Deferred();
|
||||||
|
|
||||||
tryConnect(address, 15000).done(function (publicInfo) {
|
tryConnect(address, 15000).done(function (publicInfo) {
|
||||||
|
|
|
@ -2,9 +2,14 @@
|
||||||
|
|
||||||
globalScope.ServerDiscovery = {
|
globalScope.ServerDiscovery = {
|
||||||
|
|
||||||
findServers: function () {
|
findServers: function (timeoutMs) {
|
||||||
|
|
||||||
var deferred = DeferredBuilder.Deferred();
|
var deferred = DeferredBuilder.Deferred();
|
||||||
var servers = [];
|
var servers = [];
|
||||||
|
|
||||||
|
// Expected server properties
|
||||||
|
// Name, Id, Address, EndpointAddress (optional)
|
||||||
|
|
||||||
deferred.resolveWith(null, [servers]);
|
deferred.resolveWith(null, [servers]);
|
||||||
return deferred.promise();
|
return deferred.promise();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue