Master/SpaceNinjaServer
1
0
Fork 0
forked from OpenWF/SpaceNinjaServer
Code Pull Requests Activity

Compare commits

base: Master:syndicate-options
Branches Tags
Master:main
Master:syndicate-options
Master:kim-gifts
Master:deathmark-expiry
Master:deathmark-title
Master:CompletedJobChains
Master:sortid
Master:janisslsm/2013.03.25.11.45
OpenWF:u17
OpenWF:main
OpenWF:ptb-fix
OpenWF:modifier-fix
OpenWF:syndicate-fix
OpenWF:janisslsm/2013.03.25.11.45
..
compare: Master:main
Branches Tags
Master:syndicate-options
Master:kim-gifts
Master:main
Master:deathmark-expiry
Master:deathmark-title
Master:CompletedJobChains
Master:sortid
Master:janisslsm/2013.03.25.11.45
OpenWF:u17
OpenWF:main
OpenWF:ptb-fix
OpenWF:modifier-fix
OpenWF:syndicate-fix
OpenWF:janisslsm/2013.03.25.11.45

No commits in common. "syndicate-options" and "main" have entirely different histories.
syndicate- ... main

2 changed files with 13 additions and 16 deletions
Show Stats Expand all files Collapse all files

3
static/webui/index.html
View File

@ -645,7 +645,7 @@
<form class="mt-2" onsubmit="doChangeSupportedSyndicate(); return false;">
<label class="form-label" for="changeSyndicate" data-loc="cheats_changeSupportedSyndicate"></label>
<div class="input-group">
<select class="form-control" id="changeSyndicate"></select>
<input class="form-control" id="changeSyndicate" list="datalist-Syndicates" />
<button class="btn btn-primary" type="submit" data-loc="cheats_changeButton"></button>
</div>
</form>
@ -672,6 +672,7 @@
<datalist id="datalist-SentinelWeapons"></datalist>
<datalist id="datalist-Sentinels"></datalist>
<datalist id="datalist-MechSuits"></datalist>
<datalist id="datalist-Syndicates"></datalist>
<datalist id="datalist-MoaPets"></datalist>
<datalist id="datalist-QuestKeys"></datalist>
<datalist id="datalist-miscitems"></datalist>

26
static/webui/script.js
View File

@ -178,9 +178,9 @@ function fetchItemList() {
});
const syndicateNone = document.createElement("option");
syndicateNone.textContent = loc("cheats_none");
document.getElementById("changeSyndicate").innerHTML = "";
document.getElementById("changeSyndicate").appendChild(syndicateNone);
syndicateNone.setAttribute("data-key", "");
syndicateNone.value = loc("cheats_none");
document.getElementById("datalist-Syndicates").appendChild(syndicateNone);
window.archonCrystalUpgrades = data.archonCrystalUpgrades;
@ -264,16 +264,6 @@ function fetchItemList() {
});
} else if (type == "uniqueLevelCaps") {
uniqueLevelCaps = items;
} else if (type == "Syndicates") {
items.forEach(item => {
if (item.uniqueName.startsWith("RadioLegion")) {
item.name += " (" + item.uniqueName + ")";
}
const option = document.createElement("option");
option.value = item.uniqueName;
option.textContent = item.name;
document.getElementById("changeSyndicate").appendChild(option);
});
} else {
const nameSet = new Set();
items.forEach(item => {
@ -287,6 +277,9 @@ function fetchItemList() {
item.name += " " + loc("code_badItem");
}
}
if (type == "Syndicates" && item.uniqueName.startsWith("RadioLegion")) {
item.name += " (" + item.uniqueName + ")";
}
if (type == "ModularParts") {
const supportedModularParts = [
"LWPT_HB_DECK",
@ -830,7 +823,10 @@ function updateInventory() {
single.loadRoute("/webui/inventory");
}
}
document.getElementById("changeSyndicate").value = data.SupportedSyndicate ?? "";
document.getElementById("changeSyndicate").value =
[...document.querySelectorAll("#datalist-Syndicates option")].find(
option => option.getAttribute("data-key") === (data.SupportedSyndicate ?? "")
)?.value ?? loc("cheats_none");
});
});
}
@ -1510,7 +1506,7 @@ function doImport() {
}
function doChangeSupportedSyndicate() {
const uniqueName = document.getElementById("changeSyndicate").value;
const uniqueName = getKey(document.getElementById("changeSyndicate"));
revalidateAuthz(() => {
$.get("/api/setSupportedSyndicate.php?" + window.authz + "&syndicate=" + uniqueName).done(function () {