Fixed some issues with the width of terminal

This commit is contained in:
Daniel Xie 2016-10-24 02:18:01 -05:00
parent 4ea83fa199
commit 1446a8d96e
3 changed files with 8 additions and 5 deletions

@ -8,6 +8,7 @@
padding-top: 10px; padding-top: 10px;
padding-left: 10px; padding-left: 10px;
height: auto; height: auto;
width: 100%;
font-size: 16px; font-size: 16px;
} }
@ -19,7 +20,7 @@
.terminal-input { .terminal-input {
display: table-cell; display: table-cell;
width: auto; width: 90%;
padding: 0px !important; padding: 0px !important;
margin: 0px !important; margin: 0px !important;
border: 0px; border: 0px;

@ -360,6 +360,8 @@ ForeignServers = {
/* Create a randomized network of all foreign servers */ /* Create a randomized network of all foreign servers */
createNetwork: function() { createNetwork: function() {
console.log("createNetwork() called");
//Groupings for creating a randomized network //Groupings for creating a randomized network
var NetworkGroup1 = [ForeignServers.IronGym, ForeignServers.FoodNStuff, ForeignServers.SigmaCosmetics, ForeignServers.JoesGuns, ForeignServers.HongFangTeaHouse, ForeignServers.HaraKiriSushiBar]; var NetworkGroup1 = [ForeignServers.IronGym, ForeignServers.FoodNStuff, ForeignServers.SigmaCosmetics, ForeignServers.JoesGuns, ForeignServers.HongFangTeaHouse, ForeignServers.HaraKiriSushiBar];
var NetworkGroup2 = [ForeignServers.MaxHardware, ForeignServers.NectarNightclub, ForeignServers.Zer0Nightclub]; var NetworkGroup2 = [ForeignServers.MaxHardware, ForeignServers.NectarNightclub, ForeignServers.Zer0Nightclub];

@ -24,7 +24,7 @@ $(document).keyup(function(event) {
var Terminal = { var Terminal = {
executeCommand: function(command) { executeCommand: function(command) {
var commandArray = command.split(); var commandArray = command.split(" ");
if (commandArray.length == 0) { if (commandArray.length == 0) {
return; return;
@ -51,15 +51,15 @@ var Terminal = {
var ip = commandArray[1]; var ip = commandArray[1];
for (var i = 0; i < Player.currentServer.serversOnNetwork.length; i++) { for (var i = 0; i < Player.currentServer.serversOnNetwork.length; i++) {
if (Player.currentServer.serversOnNetwork[i].ip == ip) { if (Player.currentServer.serversOnNetwork[i].ip == ip || Player.currentServer.serversOnNetwork[i].hostname == ip) {
Player.currentServer.isConnectedTo = false; Player.currentServer.isConnectedTo = false;
Player.currentServer = Player.currentServer.serversOnNetwork[i]; Player.currentServer = Player.currentServer.serversOnNetwork[i];
post("Connect to " + ip); post("Connected to " + ip);
return; return;
} }
} }
post("IP not found"); post("Host not found");
break; break;
case "df": case "df":
console.log("df terminal command called"); console.log("df terminal command called");