From 79da43984fdfb65ee3a14c939fce92b82fa1eef8 Mon Sep 17 00:00:00 2001 From: AuroraLS3 <AuroraLS3@users.noreply.github.com> Date: Fri, 11 Feb 2022 15:41:57 +0000 Subject: [PATCH] 5.4.1581 --- .../assets/plan/plan/web/js/network-values.js | 16 ++++++++-------- .../resources/assets/plan/plan/web/network.html | 9 +++------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/network-values.js b/Plan/src/main/resources/assets/plan/plan/web/js/network-values.js index 21699423f..fec870817 100644 --- a/Plan/src/main/resources/assets/plan/plan/web/js/network-values.js +++ b/Plan/src/main/resources/assets/plan/plan/web/js/network-values.js @@ -253,14 +253,14 @@ function loadservers(json, error) { return; } - let navServersHtml = ''; + let navserversHtml = ''; let serversHtml = ''; for (let i = 0; i < servers.length; i++) { - navServersHtml += addserverToNav(servers[i]); + navserversHtml += addserverToNav(servers[i]); serversHtml += createnetworkserverBox(i, servers[i]); } - document.getElementById("navSrvContainer").innerHTML = navServersHtml; + document.getElementById("navSrvContainer").innerHTML = navserversHtml; document.getElementById("data_server_list").innerHTML = serversHtml; for (let i = 0; i < servers.length; i++) { @@ -450,31 +450,31 @@ function loadJoinAddressPie(json, error) { } } -function loadPerformanceServerOptions() { +function loadperformanceserverOptions() { const refreshElement = document.querySelector(`#performance .refresh-element`); refreshElement.querySelector('i').addEventListener('click', () => { if (refreshElement.querySelector('.refresh-notice').innerHTML.length) { return; } - onSelectPerformanceServers(); + onSelectperformanceservers(); refreshElement.querySelector('.refresh-notice').innerHTML = '<i class="fa fa-fw fa-cog fa-spin"></i> Updating..'; }); const selector = document.getElementById('performance-server-selector'); - jsonRequest('./v1/network/listServers', function (json, error) { + jsonRequest('./v1/network/serverOptions', function (json, error) { if (json) { let options = ``; for (let server of json.servers) { options += `<option${server.proxy ? ' selected' : ''} data-plan-server-uuid="${server.serverUUID}">${server.serverName}</option>` } selector.innerHTML = options; - onSelectPerformanceServers(); + onSelectperformanceservers(); } else if (error) { selector.innerText = `Failed to load server list: ${error}` } }); } -async function onSelectPerformanceServers() { +async function onSelectperformanceservers() { const selector = document.getElementById('performance-server-selector'); const selectedServerUUIDs = []; diff --git a/Plan/src/main/resources/assets/plan/plan/web/network.html b/Plan/src/main/resources/assets/plan/plan/web/network.html index 8c00d9ac8..c1db61f04 100644 --- a/Plan/src/main/resources/assets/plan/plan/web/network.html +++ b/Plan/src/main/resources/assets/plan/plan/web/network.html @@ -665,12 +665,9 @@ Server selector</h6> </div> <select class="form-control" id="performance-server-selector" multiple> - <option selected>Proxy server</option> - <option>Server 1</option> - <option>Skyblock</option> - <option>Server 3</option> + <option>Loading..</option> </select> - <button class="btn bg-plan" onclick="onSelectPerformanceServers()">Apply</button> + <button class="btn bg-plan" onclick="onSelectperformanceservers()">Apply</button> </div> </div> </div> @@ -1143,7 +1140,7 @@ responsive: true }); - loadPerformanceServerOptions(); + loadperformanceserverOptions(); setLoadingText('Almost done..'); openPage();