jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2025-12-05 23:53:27 +00:00
Code Issues Releases Wiki Activity

manual fixes

Browse Source
This commit is contained in:
Thomas Grainger
2017-04-13 18:31:26 +01:00
parent b33f73ac9a
commit d05543db30
16 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/FlowControl.js
View File

@@ -48,14 +48,15 @@ const FlowControl = {
mergeDelim = ings[1],
ignoreErrors = ings[2],
subOpList = [],
inputs = [];
inputs = [],
i;
if (input)
inputs = input.split(splitDelim);
// Create subOpList for each tranche to operate on
// (all remaining operations unless we encounter a Merge)
for (var i = state.progress + 1; i < opList.length; i++) {
for (i = state.progress + 1; i < opList.length; i++) {
if (opList[i].name === "Merge" && !opList[i].isDisabled()) {
break;
} else {