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

Restore mergeServers condition

Browse source
This commit is contained in:
grafixeyehero 2019-10-28 21:35:49 +03:00
parent a9b439e458
commit 365240e17a
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bower_components/apiclient/connectionmanager.js vendored
View file

@ -37,6 +37,14 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
});
}
function mergeServers(credentialProvider, list1, list2) {
for (var i = 0, length = list2.length; i < length; i++) {
credentialProvider.addOrUpdateServer(list1, list2[i]);
}
return list1;
}
function updateServerInfo(server, systemInfo) {
server.Name = systemInfo.ServerName;
if (systemInfo.Id) {
@ -636,6 +644,7 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
return Promise.all([findServers()]).then(function (responses) {
var foundServers = responses[0];
var servers = credentials.Servers.slice(0);
mergeServers(credentialProvider, servers, foundServers);
servers.sort(function (a, b) {
return (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0);
});