Merge branch 'master' of https://github.com/mesacarlos/WebConsole
This commit is contained in:
commit
8aaa0f9efb
@ -1,5 +1,6 @@
|
||||
# WebConsole
|
||||
|
||||

|
||||
[](https://github.com/mesacarlos/WebConsole/releases/latest)
|
||||

|
||||
|
||||
|
@ -137,15 +137,15 @@
|
||||
<form>
|
||||
<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">
|
||||
<input type="text" class="form-control" id="server-name" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="server-ip" class="col-form-label" id="addServerModalSvIp">Server IP:</label>
|
||||
<input type="text" class="form-control" id="server-ip" placeholder="localhost">
|
||||
<input type="text" class="form-control" id="server-ip" placeholder="localhost" required>
|
||||
</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">
|
||||
<input type="number" class="form-control" id="server-port" placeholder="8080" required>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" id="server-ssl">
|
||||
|
@ -208,7 +208,7 @@ function closedConnection(serverName){
|
||||
//Inform user
|
||||
$('#disconnectionModal').modal('show');
|
||||
}
|
||||
//connectionManager.deleteConnection(serverName); #Commented because if activeConnection is null then servers cannot be deleted when disconnected
|
||||
connectionManager.deleteConnection(serverName, true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -41,9 +41,9 @@ class WebConsoleManager {
|
||||
* Deletes connection (for example, if a connection was closed by server).
|
||||
* Called by WebConsole.js
|
||||
*/
|
||||
deleteConnection(serverName){
|
||||
deleteConnection(serverName, deleteFromArrayOnly){
|
||||
//Delete from active connection (if it is the active one)
|
||||
if(this.activeConnection.serverName == serverName){
|
||||
if(!deleteFromArrayOnly && this.activeConnection.serverName == serverName){
|
||||
this.activeConnection = null;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user