mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-25 01:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

EOL sequences are now preserved between tabs

Browse source
This commit is contained in:
n1474335 2022-10-28 12:24:16 +01:00
parent bdb8c02d5a
commit f6ae89587c
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/web/waiters/InputWaiter.mjs
View file

@ -470,6 +470,7 @@ class InputWaiter {
* @param {string} status
* @param {number} progress
* @param {number} encoding
* @param {string} eolSequence
* @param {boolean} [silent=false] - If false, fires the manager statechange event
*/
async set(inputNum, inputData, silent=false) {
@ -477,8 +478,16 @@ class InputWaiter {
const activeTab = this.manager.tabs.getActiveTab("input");
if (inputNum !== activeTab) return;
// Update current character encoding
this.inputChrEnc = inputData.encoding;
// Update current eol sequence
this.inputEditorView.dispatch({
effects: this.inputEditorConf.eol.reconfigure(
EditorState.lineSeparator.of(inputData.eolSequence)
)
});
if (inputData.file) {
this.setFile(inputNum, inputData);
} else {
@ -634,7 +643,8 @@ class InputWaiter {
inputNum: inputNum,
buffer: buffer,
stringSample: stringSample,
encoding: this.getChrEnc()
encoding: this.getChrEnc(),
eolSequence: this.inputEditorView.state.lineBreak
}
}, transferable);
}

17
src/web/waiters/OutputWaiter.mjs
View file

@ -129,6 +129,13 @@ class OutputWaiter {
eolChange(eolVal) {
const oldOutputVal = this.getOutput();
const currentTabNum = this.manager.tabs.getActiveTab("output");
if (currentTabNum >= 0) {
this.outputs[currentTabNum].eolSequence = eolVal;
} else {
throw new Error("Cannot change output eol sequence to " + eolVal);
}
// Update the EOL value
this.outputEditorView.dispatch({
effects: this.outputEditorConf.eol.reconfigure(EditorState.lineSeparator.of(eolVal))
@ -336,7 +343,8 @@ class OutputWaiter {
status: "inactive",
bakeId: -1,
progress: false,
encoding: 0
encoding: 0,
eolSequence: "\u000a"
};
this.outputs[inputNum] = newOutput;
@ -491,6 +499,13 @@ class OutputWaiter {
const outputFile = document.getElementById("output-file");
// Update the EOL value
this.outputEditorView.dispatch({
effects: this.outputEditorConf.eol.reconfigure(
EditorState.lineSeparator.of(output.eolSequence)
)
});
// If pending or baking, show loader and status message
// If error, style the tab and handle the error
// If done, display the output if it's the active tab