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

Fixed file loading bug where the wrong input is set

This commit is contained in:
n1474335 2023-01-13 13:51:16 +00:00
parent f2bd838596
commit 17c349973d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,7 +485,10 @@ class InputWaiter {
async set(inputNum, inputData, silent=false) { async set(inputNum, inputData, silent=false) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
const activeTab = this.manager.tabs.getActiveTab("input"); const activeTab = this.manager.tabs.getActiveTab("input");
if (inputNum !== activeTab) return; if (inputNum !== activeTab) {
this.changeTab(inputNum, this.app.options.syncTabs);
return;
}
// Update current character encoding // Update current character encoding
this.inputChrEnc = inputData.encoding; this.inputChrEnc = inputData.encoding;

8
src/web/workers/InputWorker.mjs
View File

@ -434,8 +434,7 @@ self.updateTabHeader = function(inputNum) {
* @param {boolean} inputData.silent - If false, the manager statechange event will be fired * @param {boolean} inputData.silent - If false, the manager statechange event will be fired
*/ */
self.setInput = function(inputData) { self.setInput = function(inputData) {
const inputNum = inputData.inputNum; const {inputNum, silent} = inputData;
const silent = inputData.silent;
const input = self.getInputObj(inputNum); const input = self.getInputObj(inputNum);
if (input === undefined || input === null) return; if (input === undefined || input === null) return;
@ -695,8 +694,7 @@ self.terminateLoaderWorker = function(id) {
* @param {number} filesData.activeTab - The active tab in the UI * @param {number} filesData.activeTab - The active tab in the UI
*/ */
self.loadFiles = function(filesData) { self.loadFiles = function(filesData) {
const files = filesData.files; const {files, activeTab} = filesData;
const activeTab = filesData.activeTab;
let lastInputNum = -1; let lastInputNum = -1;
const inputNums = []; const inputNums = [];
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
@ -735,7 +733,7 @@ self.loadFiles = function(filesData) {
} }
self.getLoadProgress(); self.getLoadProgress();
self.setInput({inputNum: activeTab, silent: true}); self.setInput({inputNum: lastInputNum, silent: true});
}; };
/** /**