From 7f4b2574b0bb13f85aedd69697d8d0bddba6c3d8 Mon Sep 17 00:00:00 2001 From: Alexander Prinzhorn Date: Thu, 16 Apr 2020 09:59:43 +0200 Subject: [PATCH] Use proper booleans instead of relying on truthy/falsy values --- src/core/operations/Colossus.mjs | 33 ++++++++++++------- src/core/operations/ExtractDomains.mjs | 2 +- src/core/operations/ExtractFiles.mjs | 2 +- src/core/operations/FrequencyDistribution.mjs | 2 +- src/core/operations/Lorenz.mjs | 3 +- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/core/operations/Colossus.mjs b/src/core/operations/Colossus.mjs index a80cbb23..8aa9cf07 100644 --- a/src/core/operations/Colossus.mjs +++ b/src/core/operations/Colossus.mjs @@ -125,7 +125,8 @@ class Colossus extends Operation { }, { name: "R1-Negate", - type: "boolean" + type: "boolean", + value: false }, { name: "R1-Counter", @@ -164,7 +165,8 @@ class Colossus extends Operation { }, { name: "R2-Negate", - type: "boolean" + type: "boolean", + value: false }, { name: "R2-Counter", @@ -203,7 +205,8 @@ class Colossus extends Operation { }, { name: "R3-Negate", - type: "boolean" + type: "boolean", + value: false }, { name: "R3-Counter", @@ -212,7 +215,8 @@ class Colossus extends Operation { }, { name: "Negate All", - type: "boolean" + type: "boolean", + value: false }, { name: "K Rack: Addition", @@ -220,23 +224,28 @@ class Colossus extends Operation { }, { name: "Add-Q1", - type: "boolean" + type: "boolean", + value: false }, { name: "Add-Q2", - type: "boolean" + type: "boolean", + value: false }, { name: "Add-Q3", - type: "boolean" + type: "boolean", + value: false }, { name: "Add-Q4", - type: "boolean" + type: "boolean", + value: false }, { name: "Add-Q5", - type: "boolean" + type: "boolean", + value: false }, { name: "Add-Equals", @@ -246,11 +255,13 @@ class Colossus extends Operation { }, { name: "Add-Counter1", - type: "boolean" + type: "boolean", + value: false }, { name: "Add Negate All", - type: "boolean" + type: "boolean", + value: false }, { name: "Total Motor", diff --git a/src/core/operations/ExtractDomains.mjs b/src/core/operations/ExtractDomains.mjs index cc65ff4b..ea9aa3af 100644 --- a/src/core/operations/ExtractDomains.mjs +++ b/src/core/operations/ExtractDomains.mjs @@ -27,7 +27,7 @@ class ExtractDomains extends Operation { { "name": "Display total", "type": "boolean", - "value": "Extract.DISPLAY_TOTAL" + "value": true } ]; } diff --git a/src/core/operations/ExtractFiles.mjs b/src/core/operations/ExtractFiles.mjs index dd146838..7512a4e7 100644 --- a/src/core/operations/ExtractFiles.mjs +++ b/src/core/operations/ExtractFiles.mjs @@ -38,7 +38,7 @@ class ExtractFiles extends Operation { { name: "Ignore failed extractions", type: "boolean", - value: "true" + value: true } ]); } diff --git a/src/core/operations/FrequencyDistribution.mjs b/src/core/operations/FrequencyDistribution.mjs index f0e1f592..685694cc 100644 --- a/src/core/operations/FrequencyDistribution.mjs +++ b/src/core/operations/FrequencyDistribution.mjs @@ -30,7 +30,7 @@ class FrequencyDistribution extends Operation { { "name": "Show 0%s", "type": "boolean", - "value": "Entropy.FREQ_ZEROS" + "value": true } ]; } diff --git a/src/core/operations/Lorenz.mjs b/src/core/operations/Lorenz.mjs index c15f993d..e723bbb5 100644 --- a/src/core/operations/Lorenz.mjs +++ b/src/core/operations/Lorenz.mjs @@ -60,7 +60,8 @@ class Lorenz extends Operation { }, { name: "KT-Schalter", - type: "boolean" + type: "boolean", + value: false }, { name: "Mode",