From 7d5d6af4f881e89fed53feb93267f11310c0d232 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Thu, 7 Feb 2019 18:23:13 +0800 Subject: [PATCH 1/4] fix barrier offset predefined value --- .../view/blockly/blocks/trade/components.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index 8d0148fe2e..8fae2dae17 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -76,6 +76,18 @@ export const barrierOffset = block => { .setCheck('Number') .appendField(`${translate('Barrier Offset')} 1:`) .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'BARRIEROFFSETTYPE_LIST'); + } else { + const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST'); + barrierOffsetList.setValue('+'); + if (!block.workspace.getBlockById('BARRIERVALUE')) { + //eslint-disable-line + const BarrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); + BarrierValue.setFieldValue('0.036', 'NUM'); + BarrierValue.setShadow(true); + BarrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection); + BarrierValue.initSvg(); + BarrierValue.render(); + } } }; @@ -86,6 +98,18 @@ export const secondBarrierOffset = block => { .setCheck('Number') .appendField(`${translate('Barrier Offset')} 2:`) .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'SECONDBARRIEROFFSETTYPE_LIST'); + } else { + const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST'); + barrierOffsetList.setValue('-'); + if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) { + //eslint-disable-line + const BarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); + BarrierValue.setFieldValue('0.036', 'NUM'); + BarrierValue.setShadow(true); + BarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection); + BarrierValue.initSvg(); + BarrierValue.render(); + } } }; From da174b47a4e2b8c3cdd3416a03ac8f25fd8c7529 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Fri, 8 Feb 2019 12:21:06 +0800 Subject: [PATCH 2/4] edit default value --- src/botPage/view/blockly/blocks/trade/components.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index 8fae2dae17..c26f45261e 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -82,7 +82,7 @@ export const barrierOffset = block => { if (!block.workspace.getBlockById('BARRIERVALUE')) { //eslint-disable-line const BarrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); - BarrierValue.setFieldValue('0.036', 'NUM'); + BarrierValue.setFieldValue('0.274', 'NUM'); BarrierValue.setShadow(true); BarrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection); BarrierValue.initSvg(); @@ -104,7 +104,7 @@ export const secondBarrierOffset = block => { if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) { //eslint-disable-line const BarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); - BarrierValue.setFieldValue('0.036', 'NUM'); + BarrierValue.setFieldValue('0.274', 'NUM'); BarrierValue.setShadow(true); BarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection); BarrierValue.initSvg(); From 57e31fda43593c1fc2639ca364214da7dc05723a Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Fri, 8 Feb 2019 16:38:02 +0800 Subject: [PATCH 3/4] camel case vars --- .../view/blockly/blocks/trade/components.js | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index c26f45261e..6f63c08871 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -80,13 +80,12 @@ export const barrierOffset = block => { const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST'); barrierOffsetList.setValue('+'); if (!block.workspace.getBlockById('BARRIERVALUE')) { - //eslint-disable-line - const BarrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); - BarrierValue.setFieldValue('0.274', 'NUM'); - BarrierValue.setShadow(true); - BarrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection); - BarrierValue.initSvg(); - BarrierValue.render(); + const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); + barrierValue.setFieldValue('0.274', 'NUM'); + barrierValue.setShadow(true); + barrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection); + barrierValue.initSvg(); + barrierValue.render(); } } }; @@ -102,13 +101,12 @@ export const secondBarrierOffset = block => { const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST'); barrierOffsetList.setValue('-'); if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) { - //eslint-disable-line - const BarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); - BarrierValue.setFieldValue('0.274', 'NUM'); - BarrierValue.setShadow(true); - BarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection); - BarrierValue.initSvg(); - BarrierValue.render(); + const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); + secondBarrierValue.setFieldValue('0.274', 'NUM'); + secondBarrierValue.setShadow(true); + secondBarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection); + secondBarrierValue.initSvg(); + secondBarrierValue.render(); } } }; From c069edee514a766c5945132fa8b186bab78daff9 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Mon, 11 Feb 2019 11:45:33 +0800 Subject: [PATCH 4/4] edit barrieroffset list set value --- src/botPage/view/blockly/blocks/trade/components.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index 6f63c08871..8252e32ac1 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -78,9 +78,9 @@ export const barrierOffset = block => { .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'BARRIEROFFSETTYPE_LIST'); } else { const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST'); - barrierOffsetList.setValue('+'); if (!block.workspace.getBlockById('BARRIERVALUE')) { const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); + barrierOffsetList.setValue('+'); barrierValue.setFieldValue('0.274', 'NUM'); barrierValue.setShadow(true); barrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection); @@ -99,9 +99,9 @@ export const secondBarrierOffset = block => { .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'SECONDBARRIEROFFSETTYPE_LIST'); } else { const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST'); - barrierOffsetList.setValue('-'); if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) { const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); + barrierOffsetList.setValue('-'); secondBarrierValue.setFieldValue('0.274', 'NUM'); secondBarrierValue.setShadow(true); secondBarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection);