Merge pull request binary-com#1622 from sam-binary/misc-blocks

ashkanx · web-flow · commit be74d83d2ed5 · 2019-07-16T10:26:55.000+08:00
misc block error
diff --git a/src/botPage/view/blockly/blocks/tools/total_profit.js b/src/botPage/view/blockly/blocks/tools/total_profit.js
@@ -9,5 +9,18 @@ Blockly.Blocks.total_profit = {
         this.setTooltip(translate('Returns the total profit'));
         this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
     },
+    onchange: function onchange(ev) {
+        if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
+            return;
+        }
+
+        if (ev.type === Blockly.Events.MOVE) {
+            const inputStatement = this.getRootInputTargetBlock();
+
+            if (inputStatement === 'INITIALIZATION') {
+                this.unplug(true);
+            }
+        }
+    },
 };
 Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit()', Blockly.JavaScript.ORDER_ATOMIC];
diff --git a/src/botPage/view/blockly/blocks/tools/total_runs.js b/src/botPage/view/blockly/blocks/tools/total_runs.js
@@ -9,5 +9,18 @@ Blockly.Blocks.total_runs = {
         this.setTooltip(translate('Returns the number of runs since the beginning'));
         this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
     },
+    onchange: function onchange(ev) {
+        if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
+            return;
+        }
+
+        if (ev.type === Blockly.Events.MOVE) {
+            const inputStatement = this.getRootInputTargetBlock();
+
+            if (inputStatement === 'INITIALIZATION') {
+                this.unplug(true);
+            }
+        }
+    },
 };
 Blockly.JavaScript.total_runs = () => ['Bot.getTotalRuns()', Blockly.JavaScript.ORDER_ATOMIC];
diff --git a/src/botPage/view/blockly/blocks/trade/index.js b/src/botPage/view/blockly/blocks/trade/index.js
@@ -106,6 +106,7 @@ Blockly.Blocks.trade = {
             replaceInitializationBlocks(this, ev);
             resetTradeFields(this, ev);
         }
+
         decorateTrade(ev);
     },
 };
diff --git a/src/botPage/view/blockly/customBlockly.js b/src/botPage/view/blockly/customBlockly.js
@@ -403,3 +403,24 @@ const originalCustomContextLoopFn =
 Blockly.Constants.Loops.CUSTOM_CONTEXT_MENU_CREATE_VARIABLES_GET_MIXIN.customContextMenu = function(options) {
     addDownloadOption(originalCustomContextLoopFn.bind(this), options, this);
 };
+
+/**
+ * Return the parent block or null if this block is at the top level.
+ * @return {Blockly.Block} The block that holds the current block.
+ */
+Blockly.Block.prototype.getRootInputTargetBlock = function() {
+    let inputName;
+    let currentBlock = this.getParent();
+
+    while (currentBlock) {
+        const rootBlock = this.getRootBlock();
+        const currentInput = rootBlock.getInputWithBlock(currentBlock);
+
+        if (currentInput && currentInput.name) {
+            inputName = currentInput.name;
+        }
+        currentBlock = currentBlock.getParent();
+    }
+
+    return inputName;
+};

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ Blockly.Blocks.trade = {`
`106`	`106`	`replaceInitializationBlocks(this, ev);`
`107`	`107`	`resetTradeFields(this, ev);`
`108`	`108`	`}`
	`109`	`+`
`109`	`110`	`decorateTrade(ev);`
`110`	`111`	`},`
`111`	`112`	`};`