update loops tutorial

2020-10-06 11:35:58 +02:00
parent c99ca92a4e
commit 40d8301990
2 changed files with 209 additions and 135 deletions
@@ -1,53 +1,80 @@

 import Blockly from 'blockly';
 import { getColour } from '../helpers/colour';
+import { getCompatibleTypes } from '../helpers/types'

-Blockly.defineBlocksWithJsonArray([
-    {
-        type: 'controls_for',
-        message0: 'count with %1 from %2 to %3 by adding %4',
-        args0: [
-            {
-                type: 'field_variable',
-                name: 'VAR',
-                variable: null,
-                variableTypes: ['Number'],
-                defaultType: 'Number',
-                createNewVariable: true,
-                showOnlyVariableAssigned: false,
-            },
-            {
-                type: 'input_value',
-                name: 'FROM',
-                check: 'Number',
-                align: 'RIGHT',
-            },
-            {
-                type: 'input_value',
-                name: 'TO',
-                check: 'Number',
-                align: 'RIGHT',
-            },
-            {
-                type: 'input_value',
-                name: 'BY',
-                check: 'Number',
-                align: 'RIGHT',
-            },
-        ],
-        message1: '%{BKY_CONTROLS_REPEAT_INPUT_DO} %1',
-        args1: [
-            {
-                type: 'input_statement',
-                name: 'DO',
-            },
-        ],
-        inputsInline: false,
-        previousStatement: null,
-        nextStatement: null,
-        colour: getColour().loops,
-        helpUrl: '%{BKY_CONTROLS_FOR_HELPURL}',
-        extensions: ['contextMenu_newGetVariableBlock', 'controls_for_tooltip'],
-    },
-]);
+// Blockly.defineBlocksWithJsonArray([
+//     {
+//         type: 'controls_for',
+//         message0: 'count with %1 from %2 to %3 by adding %4',
+//         args0: [
+//             {
+//                 type: 'field_variable',
+//                 name: 'VAR',
+//                 variable: null,
+//                 variableTypes: ['Number'],
+//                 defaultType: 'Number',
+//                 createNewVariable: true,
+//                 showOnlyVariableAssigned: false,
+//             },
+//             {
+//                 type: 'input_value',
+//                 name: 'FROM',
+//                 check: 'Number',
+//                 align: 'RIGHT',
+//             },
+//             {
+//                 type: 'input_value',
+//                 name: 'TO',
+//                 check: 'Number',
+//                 align: 'RIGHT',
+//             },
+//             {
+//                 type: 'input_value',
+//                 name: 'BY',
+//                 check: 'Number',
+//                 align: 'RIGHT',
+//             },
+//         ],
+//         message1: '%{BKY_CONTROLS_REPEAT_INPUT_DO} %1',
+//         args1: [
+//             {
+//                 type: 'input_statement',
+//                 name: 'DO',
+//             },
+//         ],
+//         inputsInline: false,
+//         previousStatement: null,
+//         nextStatement: null,
+//         colour: getColour().loops,
+//         helpUrl: '%{BKY_CONTROLS_FOR_HELPURL}',
+//         extensions: ['contextMenu_newGetVariableBlock', 'controls_for_tooltip'],
+//     },
+// ]);
+
+Blockly.Blocks['controls_repeat_ext'] = {
+    /**
+     * Block for repeat n times (external number).
+     * @this Blockly.Block
+     */
+    init: function () {
+        this.jsonInit({
+            "message0": Blockly.Msg.CONTROLS_REPEAT_TITLE,
+            "args0": [
+                {
+                    "type": "input_value",
+                    "name": "TIMES",
+                    "check": getCompatibleTypes(Number),
+                }
+            ],
+            "previousStatement": null,
+            "nextStatement": null,
+            "colour": getColour().loops,
+            "tooltip": Blockly.Msg.CONTROLS_REPEAT_TOOLTIP,
+            "helpUrl": Blockly.Msg.CONTROLS_REPEAT_HELPURL
+        });
+        this.appendStatementInput('DO')
+            .appendField(Blockly.Msg.CONTROLS_REPEAT_INPUT_DO);
+    }
+};