Mirrors/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2025-01-09 11:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Output info tidied up for file outputs

Browse source
This commit is contained in:
n1474335 2017-12-27 23:05:32 +00:00
parent f7f07f2cb5
commit 50e4daeaf2
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/web/OutputWaiter.js
View file

@ -63,8 +63,9 @@ OutputWaiter.prototype.set = function(data, type, duration, preserveBuffer) {
outputText.value = ""; outputText.value = "";
outputHtml.innerHTML = data; outputHtml.innerHTML = data;
length = data.length;
this.dishStr = Utils.stripHtmlTags(data, true); this.dishStr = Utils.stripHtmlTags(data, true);
length = data.length;
lines = this.dishStr.count("\n") + 1;
// Execute script sections // Execute script sections
scriptElements = outputHtml.querySelectorAll("script"); scriptElements = outputHtml.querySelectorAll("script");
@ -84,8 +85,8 @@ OutputWaiter.prototype.set = function(data, type, duration, preserveBuffer) {
outputText.value = ""; outputText.value = "";
outputHtml.innerHTML = ""; outputHtml.innerHTML = "";
length = data.byteLength;
this.dishStr = ""; this.dishStr = "";
length = data.byteLength;
this.setFile(data); this.setFile(data);
break; break;
@ -177,6 +178,7 @@ OutputWaiter.prototype.showFileOverlayClick = function(e) {
outputFile.style.display = "block"; outputFile.style.display = "block";
showFileOverlay.style.display = "none"; showFileOverlay.style.display = "none";
this.setOutputInfo(this.dishBuffer.byteLength, null, 0);
}; };
@ -191,15 +193,17 @@ OutputWaiter.prototype.setOutputInfo = function(length, lines, duration) {
let width = length.toString().length; let width = length.toString().length;
width = width < 4 ? 4 : width; width = width < 4 ? 4 : width;
lines = typeof lines === "number" ? lines : "";
const lengthStr = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;"); const lengthStr = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
const linesStr = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
const timeStr = Utils.pad(duration.toString() + "ms", width, " ").replace(/ /g, "&nbsp;"); const timeStr = Utils.pad(duration.toString() + "ms", width, " ").replace(/ /g, "&nbsp;");
document.getElementById("output-info").innerHTML = "time: " + timeStr + let msg = "time: " + timeStr + "<br>length: " + lengthStr;
"<br>length: " + lengthStr +
"<br>lines: " + linesStr; if (typeof lines === "number") {
const linesStr = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
msg += "<br>lines: " + linesStr;
}
document.getElementById("output-info").innerHTML = msg;
document.getElementById("input-selection-info").innerHTML = ""; document.getElementById("input-selection-info").innerHTML = "";
document.getElementById("output-selection-info").innerHTML = ""; document.getElementById("output-selection-info").innerHTML = "";
}; };

2
src/web/stylesheets/layout/_io.css
View file

@ -111,6 +111,8 @@
font-family: var(--fixed-width-font-family); font-family: var(--fixed-width-font-family);
font-weight: normal; font-weight: normal;
font-size: 8pt; font-size: 8pt;
display: flex;
align-items: center;
} }
#input-info { #input-info {