Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change pasting to keep cursor position. 

Move output scrolling to changeTab() instead of set()
This commit is contained in:
j433866 2019-06-06 10:26:16 +01:00
parent 39101610d5
commit 98af95a6ce
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/web/waiters/InputWaiter.mjs
View File

@ -699,7 +699,14 @@ class InputWaiter {
// changing the value, so instead change it here ourselves
// and manually fire inputChange()
e.preventDefault();
document.getElementById("input-text").value += pastedData;
const inputText = document.getElementById("input-text");
const selStart = inputText.selectionStart;
const selEnd = inputText.selectionEnd;
const startVal = inputText.value.slice(0, selStart);
const endVal = inputText.value.slice(selEnd);
inputText.value = startVal + pastedData + endVal;
inputText.setSelectionRange(selStart + pastedData.length, selStart + pastedData.length);
this.debounceInputChange(e);
} else {
e.preventDefault();

6
src/web/waiters/OutputWaiter.mjs
View File

@ -293,7 +293,6 @@ class OutputWaiter {
inputHighlighter.display = "none";
outputText.value = output.error;
outputText.scroll(0, 0);
outputHtml.innerHTML = "";
} else if (output.status === "baked" || output.status === "inactive") {
document.querySelector("#output-loader .loading-msg").textContent = `Loading output ${inputNum}`;
@ -327,7 +326,6 @@ class OutputWaiter {
outputText.value = "";
outputHtml.innerHTML = output.data.result;
outputHtml.scroll(0, 0);
// Execute script sections
scriptElements = outputHtml.querySelectorAll("script");
@ -360,7 +358,6 @@ class OutputWaiter {
inputHighlighter.display = "block";
outputText.value = Utils.printable(output.data.result, true);
outputText.scroll(0, 0);
outputHtml.innerHTML = "";
lines = output.data.result.count("\n") + 1;
@ -745,6 +742,9 @@ class OutputWaiter {
this.app.debounce(this.set, 50, "setOutput", this, [inputNum])();
document.getElementById("output-html").scroll(0, 0);
document.getElementById("output-text").scroll(0, 0);
if (changeInput) {
this.manager.input.changeTab(inputNum, false);
}