Uplandustries/WebConsole-Client-v2.4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New server form is finally validating data (yay!)

Browse Source
This commit is contained in:
Carlos 2020-10-31 18:54:30 +01:00
parent ffe238e977
commit 7c4286f7df
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/index.html
View File

@ -149,10 +149,13 @@
</button>
</div>
<div class="modal-body">
<form>
<form id="addServerForm">
<div class="form-group">
<label for="server-name" class="col-form-label" id="addServerModalSvName">Server name:</label>
<input type="text" class="form-control" id="server-name" required>
<div class="invalid-feedback" id="serverNameInvalidFeedback">
Please provide a valid servername.
</div>
</div>
<div class="form-group">
<label for="server-ip" class="col-form-label" id="addServerModalSvIp">Server IP:</label>
@ -160,7 +163,7 @@
</div>
<div class="form-group">
<label for="server-port" class="col-form-label" id="addServerModalSvPort">Server port:</label>
<input type="number" class="form-control" id="server-port" placeholder="8080" required>
<input type="number" class="form-control" id="server-port" placeholder="8080" min="1" max="65535" required>
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" id="server-ssl">
@ -171,7 +174,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" id="addServerModalClose">Close</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="saveAndConnectServerButton">Save and connect</button>
<button type="button" class="btn btn-primary" id="saveAndConnectServerButton">Save and connect</button>
</div>
</div>
</div>

2
client/scripts/WebConsole.js
View File

@ -24,7 +24,7 @@ function openServer(serverName){
//Change server name and related info
$("#serverTitle").text(serverName);
$("#consoleTextArea").text("");
$("#consoleTextArea").text("Connecting...");
$("#commandInput").prop("disabled", false);
$("#sendCommandButton").prop("disabled", false);

13
client/scripts/WebConsoleJqueryHandler.js
View File

@ -34,6 +34,13 @@ $(document).ready(function() {
* Add server modal button click
*/
$("#saveAndConnectServerButton").click(function() {
//Validate form data
var addServerForm = document.getElementById("addServerForm");
if(!addServerForm.checkValidity()){
addServerForm.classList.add('was-validated');
return;
}
//Save server
var name = $("#server-name").val().replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"").replace(/"/g,"");
var wcIp = $("#server-ip").val();
@ -46,7 +53,11 @@ $("#saveAndConnectServerButton").click(function() {
uri = "ws://" + wcIp + ":" + wcPort;
}
persistenceManager.saveServer(new WSServer(name, uri));
//Close modal
addServerForm.classList.remove('was-validated');
$("#addServerModal").modal('hide');
//Empty all modal values
$("#server-name").val("");
$("#server-ip").val("");