Show received messages on server switch
This commit is contained in:
parent
4e6b1b865e
commit
bbb35815e9
@ -51,8 +51,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Server management container -->
|
<!-- Server management container -->
|
||||||
<div class="container" id="serverContainer">
|
<div class="container" id="serverContainer" style="display: none;">
|
||||||
<h1 class="mt-5">Survival</h1>
|
<h1 class="mt-5" id="serverTitle"></h1>
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<textarea class="form-control" rows="20" id="consoleTextArea" disabled></textarea>
|
<textarea class="form-control" rows="20" id="consoleTextArea" disabled></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
@ -76,6 +76,9 @@ $('#passwordModal').on('hidden.bs.modal', function (e) {
|
|||||||
svObj.setPassword(pwd);
|
svObj.setPassword(pwd);
|
||||||
persistenceManager.saveServer(svObj);
|
persistenceManager.saveServer(svObj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Remove password from modal
|
||||||
|
$("#server-pwd").val('');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@ -89,12 +92,25 @@ function openServer(serverName){
|
|||||||
$("#welcomeContainer").hide();
|
$("#welcomeContainer").hide();
|
||||||
$("#serverContainer").show();
|
$("#serverContainer").show();
|
||||||
|
|
||||||
|
//Change server name and related info
|
||||||
|
$("#serverTitle").text(serverName);
|
||||||
|
$("#consoleTextArea").text("");
|
||||||
|
|
||||||
//New server, new variables:
|
//New server, new variables:
|
||||||
autoPasswordCompleted = false;
|
autoPasswordCompleted = false;
|
||||||
|
|
||||||
//Create or retrieve connection
|
//Create or retrieve connection
|
||||||
connectionManager.loadConnection(serverName);
|
connectionManager.loadConnection(serverName);
|
||||||
|
|
||||||
|
//Load saved messages
|
||||||
|
var i;
|
||||||
|
var messages = connectionManager.activeConnection.messages;
|
||||||
|
for(i = 0; i < messages.length; i++){
|
||||||
|
if(messages[i].status != 401){
|
||||||
|
onWebSocketsMessage(messages[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Subscribe a function
|
//Subscribe a function
|
||||||
connectionManager.activeConnection.subscribe(onWebSocketsMessage);
|
connectionManager.activeConnection.subscribe(onWebSocketsMessage);
|
||||||
}
|
}
|
||||||
@ -173,7 +189,7 @@ function updateServerList(){
|
|||||||
//Add all servers
|
//Add all servers
|
||||||
var servers = persistenceManager.getAllServers();
|
var servers = persistenceManager.getAllServers();
|
||||||
for(var i = 0; i < servers.length; i++){
|
for(var i = 0; i < servers.length; i++){
|
||||||
$('#ServerListDropDown').append('<a class="dropdown-item servermenuitem" href="#" onclick=openServer("' + servers[i].serverName + '")>' + servers[i].serverName + '</a>');
|
$('#ServerListDropDown').append('<a class="dropdown-item servermenuitem" href="#" onclick="openServer(\'' + servers[i].serverName + '\')">' + servers[i].serverName + '</a>');
|
||||||
}
|
}
|
||||||
|
|
||||||
//Show a "no servers" message when no servers are added
|
//Show a "no servers" message when no servers are added
|
||||||
|
Loading…
x
Reference in New Issue
Block a user