Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Do not encapsulate variables in quotes, remove unused code #1385

Merged
merged 2 commits into from
Apr 2, 2019
Merged

Do not encapsulate variables in quotes, remove unused code #1385

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
121453a
Do not encapsulate variables in quotes, remove unused code
Apr 1, 2019
deb44b9
Remove expectValue import (no-unused-vars)
Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions src/botPage/view/blockly/blocks/trade/tradeOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { setInputList, updateInputList, getParentValue } from './tools';
import {
expectValue,
haveContractsForSymbol,
getContractsAvailableForSymbol,
getDurationsForContracts,
Expand Down Expand Up @@ -312,15 +311,10 @@ export default () => {
},
};
Blockly.JavaScript.tradeOptions = block => {
const tradeDefBlock = findTopParentBlock(block);
if (!tradeDefBlock) {
return '';
}

const durationValue = expectValue(block, 'DURATION');
const durationValue = Blockly.JavaScript.valueToCode(block, 'DURATION', Blockly.JavaScript.ORDER_ATOMIC) || '0';
const durationType = block.getFieldValue('DURATIONTYPE_LIST');
const currency = block.getFieldValue('CURRENCY_LIST');
const amount = expectValue(block, 'AMOUNT');
const amount = Blockly.JavaScript.valueToCode(block, 'AMOUNT', Blockly.JavaScript.ORDER_ATOMIC) || '0';

const isVisibleField = field => block.getInput(field) && block.getInput(field).isVisible();

Expand All @@ -329,18 +323,29 @@ export default () => {
let secondBarrierOffsetValue = 'undefined';

if (isVisibleField('PREDICTION')) {
predictionValue = expectValue(block, 'PREDICTION');
predictionValue =
Blockly.JavaScript.valueToCode(block, 'PREDICTION', Blockly.JavaScript.ORDER_ATOMIC) || '0';
}

const getBarrierValue = (barrierOffsetType, value) => {
// Variables should not be encapsulated in quotes
if (/^(\d+(\.\d+)?)$/.test(value)) {
return barrierOffsetType === 'absolute' ? `'${value}'` : `'${barrierOffsetType}${value}'`;
}
return barrierOffsetType === 'absolute' ? value : `'${barrierOffsetType}' + ${value}`;
};

if (isVisibleField('BARRIEROFFSET')) {
const barrierOffsetType = block.getFieldValue('BARRIEROFFSETTYPE_LIST');
const value = expectValue(block, 'BARRIEROFFSET');
barrierOffsetValue = barrierOffsetType === 'absolute' ? `'${value}'` : `'${barrierOffsetType}${value}'`;
const value =
Blockly.JavaScript.valueToCode(block, 'BARRIEROFFSET', Blockly.JavaScript.ORDER_ATOMIC) || '0';
barrierOffsetValue = getBarrierValue(barrierOffsetType, value);
}
if (isVisibleField('SECONDBARRIEROFFSET')) {
const barrierOffsetType = block.getFieldValue('SECONDBARRIEROFFSETTYPE_LIST');
const value = expectValue(block, 'SECONDBARRIEROFFSET');
secondBarrierOffsetValue =
barrierOffsetType === 'absolute' ? `'${value}'` : `'${barrierOffsetType}${value}'`;
const value =
Blockly.JavaScript.valueToCode(block, 'SECONDBARRIEROFFSET', Blockly.JavaScript.ORDER_ATOMIC) || '0';
secondBarrierOffsetValue = getBarrierValue(barrierOffsetType, value);
}

const code = `
Expand Down