|
@@ -48,9 +48,13 @@
|
|
$.get("log/from?start=" + currentLogID, function(data) {
|
|
$.get("log/from?start=" + currentLogID, function(data) {
|
|
previd = currentLogID;
|
|
previd = currentLogID;
|
|
$.each(data, function(index, value) {
|
|
$.each(data, function(index, value) {
|
|
- $("#log").append(value.Log + "<br>");
|
|
|
|
|
|
+ //to prevent something like octave:1> octave:2> x=3
|
|
|
|
+ const regex = /(?:.(?!octave:[0-9]*> ))+$/g;
|
|
|
|
+ const processedLog = value.Log.match(regex);
|
|
|
|
+ $("#log").append(processedLog + "<br>");
|
|
currentLogID = value.ID + 1;
|
|
currentLogID = value.ID + 1;
|
|
});
|
|
});
|
|
|
|
+ $("#log").scrollTop($("#log")[0].scrollHeight);
|
|
loading = false;
|
|
loading = false;
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -59,7 +63,7 @@
|
|
function sendCmd() {
|
|
function sendCmd() {
|
|
var cmdVal = $("#command").val();
|
|
var cmdVal = $("#command").val();
|
|
$.get("sendcommand?command=" + cmdVal);
|
|
$.get("sendcommand?command=" + cmdVal);
|
|
- $("#log").append("Command: [" + cmdVal + "] sent\n");
|
|
|
|
|
|
+ $("#log").append("octave> " + cmdVal + "\n");
|
|
$("#command").val("");
|
|
$("#command").val("");
|
|
}
|
|
}
|
|
|
|
|