Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-13 03:37:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Escape html for weblog in the client"

Browse Source 
This reverts commit 8da3f54e91.
This commit is contained in:
Xose Pérez
2018-03-30 23:59:41 +02:00
parent 6f62758244
commit 448ce2ccb9
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/html/custom.css
View File

@@ -129,7 +129,7 @@ div.state {
}
.pure-g span.terminal,
.pure-g ul.terminal {
.pure-g textarea.terminal {
font-family: 'Courier New', monospace;
font-size: 80%;
line-height: 100%;
@@ -316,8 +316,5 @@ span.slider {
#weblog {
height: 400px;
padding: 0.5em 0.6em;
margin-bottom: 10px;
list-style: none;
overflow-y: scroll;
}

2
code/html/custom.js
View File

@@ -1161,7 +1161,7 @@ function processData(data) {
// Web log
if ("weblog" === key) {
$("<li></li>").addClass("weblog-event").text(value).appendTo("#weblog");
$("#weblog").append(value);
$("#weblog").scrollTop($("#weblog")[0].scrollHeight - $("#weblog").height());
return;
}

4
code/html/index.html
View File

@@ -983,8 +983,8 @@
</div>
<div class="pure-g">
<ul class="pure-u-1 terminal" id="weblog" name="weblog"></ul>
<div class="pure-u-1-4 pure-u-lg-1-4"><button class="pure-button button-dbg-clear pure-u-23-24">Clear</button></div>
<textarea class="pure-u-1 terminal" id="weblog" name="weblog" wrap="off" readonly></textarea>
<div class=" pure-u-1-4 pure-u-lg-1-4"><button class="pure-button button-dbg-clear pure-u-23-24">Clear</button></div>
</div>
</fieldset>