mirror of
https://github.com/OpenFusionProject/Client.git
synced 2024-11-14 02:30:05 +00:00
added fixes for validation
This commit is contained in:
parent
a859590ef9
commit
0201f11333
@ -180,7 +180,7 @@ function restoreDefaultServers() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function validateVersionSave(modalName) {
|
function validateVersionSave(modalName) {
|
||||||
// works everytime a key is entered into the server save form
|
// works everytime a key is entered into the version save form
|
||||||
var nameInput = document.getElementById(modalName + "version-nameinput");
|
var nameInput = document.getElementById(modalName + "version-nameinput");
|
||||||
var urlInput = document.getElementById(modalName + "version-urlinput");
|
var urlInput = document.getElementById(modalName + "version-urlinput");
|
||||||
var button = document.getElementById(modalName + "version-savebutton");
|
var button = document.getElementById(modalName + "version-savebutton");
|
||||||
@ -189,7 +189,13 @@ function validateVersionSave(modalName) {
|
|||||||
nameInput.classList.remove("invalidinput");
|
nameInput.classList.remove("invalidinput");
|
||||||
urlInput.classList.remove("invalidinput");
|
urlInput.classList.remove("invalidinput");
|
||||||
|
|
||||||
|
var matchingVersions = versionArray.filter(function (obj) {
|
||||||
|
return obj.name === nameInput.value;
|
||||||
|
});
|
||||||
|
var allowedMatches = (modalName === "edit") ? 1 : 0;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
matchingVersions.length > allowedMatches ||
|
||||||
nameInput.value.length < parseInt(nameInput.getAttribute("minlength")) ||
|
nameInput.value.length < parseInt(nameInput.getAttribute("minlength")) ||
|
||||||
nameInput.value.length > parseInt(nameInput.getAttribute("maxlength"))
|
nameInput.value.length > parseInt(nameInput.getAttribute("maxlength"))
|
||||||
) {
|
) {
|
||||||
@ -330,10 +336,6 @@ function loadServerList() {
|
|||||||
// No servers are added, make sure placeholder is visible
|
// No servers are added, make sure placeholder is visible
|
||||||
$("#server-listing-placeholder").attr("hidden", false);
|
$("#server-listing-placeholder").attr("hidden", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check these once to get them into the correct state
|
|
||||||
validateServerSave("add");
|
|
||||||
validateServerSave("edit");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadCacheList() {
|
function loadCacheList() {
|
||||||
@ -372,10 +374,6 @@ function loadCacheList() {
|
|||||||
storageLoadingStart();
|
storageLoadingStart();
|
||||||
storageLoadingUpdate(cacheSizes);
|
storageLoadingUpdate(cacheSizes);
|
||||||
storageLoadingComplete(cacheSizes);
|
storageLoadingComplete(cacheSizes);
|
||||||
|
|
||||||
// Check these once to get them into the correct state
|
|
||||||
validateVersionSave("add");
|
|
||||||
validateVersionSave("edit");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function startHashCheck() {
|
function startHashCheck() {
|
||||||
@ -847,6 +845,14 @@ $("#server-table").on("dblclick", ".server-listing-entry", function (event) {
|
|||||||
connectToServer();
|
connectToServer();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#of-addservermodal").on("show.bs.modal", function (e) {
|
||||||
|
validateServerSave("add");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#of-addversionmodal").on("show.bs.modal", function (e) {
|
||||||
|
validateVersionSave("add");
|
||||||
|
});
|
||||||
|
|
||||||
$("#of-editservermodal").on("show.bs.modal", function (e) {
|
$("#of-editservermodal").on("show.bs.modal", function (e) {
|
||||||
var jsonToModify = remotefs.readJsonSync(serversPath);
|
var jsonToModify = remotefs.readJsonSync(serversPath);
|
||||||
|
|
||||||
@ -864,6 +870,8 @@ $("#of-editservermodal").on("show.bs.modal", function (e) {
|
|||||||
$("#editserver-versionselect")[0].selectedIndex = versionIndex;
|
$("#editserver-versionselect")[0].selectedIndex = versionIndex;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
validateServerSave("edit");
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#of-editversionmodal").on("show.bs.modal", function (e) {
|
$("#of-editversionmodal").on("show.bs.modal", function (e) {
|
||||||
@ -875,6 +883,8 @@ $("#of-editversionmodal").on("show.bs.modal", function (e) {
|
|||||||
$("#editversion-urlinput")[0].value = value["url"];
|
$("#editversion-urlinput")[0].value = value["url"];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
validateVersionSave("edit");
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#of-deleteservermodal").on("show.bs.modal", function (e) {
|
$("#of-deleteservermodal").on("show.bs.modal", function (e) {
|
||||||
|
@ -267,7 +267,7 @@
|
|||||||
id="addserver-ipinput"
|
id="addserver-ipinput"
|
||||||
placeholder="127.0.0.1:23000"
|
placeholder="127.0.0.1:23000"
|
||||||
required=""
|
required=""
|
||||||
pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]):[0-9]+$"
|
pattern="^([-a-zA-Z0-9]+\.)+[-a-zA-Z0-9]+:[0-9]+$"
|
||||||
oninput="validateServerSave('add')"
|
oninput="validateServerSave('add')"
|
||||||
/><label for="addserver-versionselect"
|
/><label for="addserver-versionselect"
|
||||||
>Game Version: </label
|
>Game Version: </label
|
||||||
@ -342,7 +342,7 @@
|
|||||||
id="editserver-ipinput"
|
id="editserver-ipinput"
|
||||||
placeholder="127.0.0.1:23000"
|
placeholder="127.0.0.1:23000"
|
||||||
required=""
|
required=""
|
||||||
pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]):[0-9]+$"
|
pattern="^([-a-zA-Z0-9]+\.)+[-a-zA-Z0-9]+:[0-9]+$"
|
||||||
oninput="validateServerSave('edit')"
|
oninput="validateServerSave('edit')"
|
||||||
/><label for="editserver-versionselect"
|
/><label for="editserver-versionselect"
|
||||||
>Game Version: </label
|
>Game Version: </label
|
||||||
|
Loading…
Reference in New Issue
Block a user