Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6907 from huffman/fix-console-log

Browse source 
Fix auto scroll and font in console log window
This commit is contained in:
Stephen Birarda 2016-01-22 12:04:56 -08:00
commit 61430235a0
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server-console/src/log.css
View file

@ -52,6 +52,7 @@ ul.tabs li.current {
display: none; display: none;
background-color: #ededed; background-color: #ededed;
width: 100%; width: 100%;
height: 100%;
overflow: auto; overflow: auto;
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -63,7 +64,7 @@ ul.tabs li.current {
} }
.tab-content { .tab-content {
overflow: auto; overflow: hidden;
padding: 10px; padding: 10px;
background-color: #ededed; background-color: #ededed;
} }
@ -84,4 +85,9 @@ ul.tabs li.current {
display: none; display: none;
float: right; float: right;
margin: 10px; margin: 10px;
} }
.log-line {
font-family: "Consolas", monospace;
font-size: 9.5pt;
}

7
server-console/src/log.js
View file

@ -154,9 +154,7 @@ ready = function() {
} }
function appendLogMessage(pid, msg, name) { function appendLogMessage(pid, msg, name) {
console.log(pid, msg, name); var id = name == "ds" ? "domain-server" : "assignment-client";
var id = "pid-" + pid;
id = name == "ds" ? "domain-server" : "assignment-client";
var $pidLog = $('#' + id); var $pidLog = $('#' + id);
var size = ++tabStates[id].size; var size = ++tabStates[id].size;
@ -167,8 +165,7 @@ ready = function() {
var wasAtBottom = false; var wasAtBottom = false;
if (currentTab == id) { if (currentTab == id) {
var padding = 15; wasAtBottom = $pidLog[0].scrollTop >= ($pidLog[0].scrollHeight - $pidLog.height());
wasAtBottom = $pidLog[0].scrollTop >= ($pidLog[0].scrollHeight - $pidLog.height() - (2 * padding));
} }
var $logLine = $('<div class="log-line">').text(msg); var $logLine = $('<div class="log-line">').text(msg);