martin/nci
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/nci.git synced 2025-02-11 11:59:16 +00:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
oleg 2015-07-09 00:19:53 +03:00
commit efacf539cc
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
static/css/sources/components/terminal.less
View File

@ -1,13 +1,25 @@
.terminal { .terminal {
box-sizing: border-box; box-sizing: border-box;
&_code { &_code {
height: 300px; height: 300px;
padding: 4px; padding: 8px;
box-sizing: border-box; box-sizing: border-box;
overflow-y: scroll; overflow-y: scroll;
border: none; border: none;
white-space: pre-wrap;
color: white; color: white;
background-color: black; background-color: black;
line-height: 0.8;
font-size: 12px;
font-family: Monaco, Monosapce, sans-serif;
&_newline {
display: block;
margin: 0.8em 0;
white-space: pre;
&:first-child {
margin-top: 0;
}
}
} }
} }

9
static/js/app/components/terminal/terminal.js
View File

@ -33,10 +33,17 @@ define([
} }
this.ignoreScrollEvent = false; this.ignoreScrollEvent = false;
}, },
prepareOutput: function(output) {
var text = output.replace(
/(.*)\n/gi,
'<span class="terminal_code_newline">$1</span>'
);
return ansiUp.ansi_to_html(text);
},
updateItems: function(build) { updateItems: function(build) {
// listen just our console update // listen just our console update
if (build.buildId === this.props.build) { if (build.buildId === this.props.build) {
this.setState({data: ansiUp.ansi_to_html(build.data)}); this.setState({data: this.prepareOutput(build.data)});
_.defer(this.ensureScrollPosition); _.defer(this.ensureScrollPosition);
this.ensureScrollPosition(); this.ensureScrollPosition();
} }