From d401a45d205617feb150c5689e40c5e3186ab130 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 22 Jan 2016 11:51:56 -0800 Subject: [PATCH] Fix auto scroll and font in console log window --- server-console/src/log.css | 10 ++++++++-- server-console/src/log.js | 7 ++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/server-console/src/log.css b/server-console/src/log.css index d13a48b5a0..0a0aa4acb5 100644 --- a/server-console/src/log.css +++ b/server-console/src/log.css @@ -52,6 +52,7 @@ ul.tabs li.current { display: none; background-color: #ededed; width: 100%; + height: 100%; overflow: auto; margin: 0; padding: 0; @@ -63,7 +64,7 @@ ul.tabs li.current { } .tab-content { - overflow: auto; + overflow: hidden; padding: 10px; background-color: #ededed; } @@ -84,4 +85,9 @@ ul.tabs li.current { display: none; float: right; margin: 10px; -} \ No newline at end of file +} + +.log-line { + font-family: "Consolas", monospace; + font-size: 9.5pt; +} diff --git a/server-console/src/log.js b/server-console/src/log.js index d7aae8a432..fffe1006b4 100644 --- a/server-console/src/log.js +++ b/server-console/src/log.js @@ -154,9 +154,7 @@ ready = function() { } function appendLogMessage(pid, msg, name) { - console.log(pid, msg, name); - var id = "pid-" + pid; - id = name == "ds" ? "domain-server" : "assignment-client"; + var id = name == "ds" ? "domain-server" : "assignment-client"; var $pidLog = $('#' + id); var size = ++tabStates[id].size; @@ -167,8 +165,7 @@ ready = function() { var wasAtBottom = false; if (currentTab == id) { - var padding = 15; - wasAtBottom = $pidLog[0].scrollTop >= ($pidLog[0].scrollHeight - $pidLog.height() - (2 * padding)); + wasAtBottom = $pidLog[0].scrollTop >= ($pidLog[0].scrollHeight - $pidLog.height()); } var $logLine = $('
').text(msg);