schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from sensebox/fix/boolean-return-type

Browse Source 
Fix/boolean return type
This commit is contained in:
Mario Pesch 2020-10-16 15:01:06 +02:00 committed by GitHub
commit b310d290cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/Blockly/blocks/logic.js
View File

@ -19,7 +19,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
] ]
} }
], ],
"output": "Boolean", "output": Types.BOOLEAN.typeName,
"style": "logic_blocks", "style": "logic_blocks",
"tooltip": "%{BKY_LOGIC_BOOLEAN_TOOLTIP}", "tooltip": "%{BKY_LOGIC_BOOLEAN_TOOLTIP}",
"helpUrl": "%{BKY_LOGIC_BOOLEAN_HELPURL}" "helpUrl": "%{BKY_LOGIC_BOOLEAN_HELPURL}"
@ -32,7 +32,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{ {
"type": "input_value", "type": "input_value",
"name": "IF0", "name": "IF0",
"check": "Boolean" "check": Types.getCompatibleTypes('boolean')
} }
], ],
"message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1", "message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1",
@ -57,7 +57,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{ {
"type": "input_value", "type": "input_value",
"name": "IF0", "name": "IF0",
"check": "Boolean" "check": Types.getCompatibleTypes('boolean')
} }
], ],
"message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1", "message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1",
@ -108,7 +108,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
} }
], ],
"inputsInline": true, "inputsInline": true,
"output": "Boolean", "output": Types.BOOLEAN.typeName,
"style": "logic_blocks", "style": "logic_blocks",
"helpUrl": "%{BKY_LOGIC_COMPARE_HELPURL}", "helpUrl": "%{BKY_LOGIC_COMPARE_HELPURL}",
"extensions": ["logic_compare", "logic_op_tooltip"] "extensions": ["logic_compare", "logic_op_tooltip"]
@ -121,7 +121,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{ {
"type": "input_value", "type": "input_value",
"name": "A", "name": "A",
"check": "Boolean" "check": Types.getCompatibleTypes('boolean')
}, },
{ {
"type": "field_dropdown", "type": "field_dropdown",
@ -134,11 +134,11 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{ {
"type": "input_value", "type": "input_value",
"name": "B", "name": "B",
"check": "Boolean" "check": Types.getCompatibleTypes('boolean')
} }
], ],
"inputsInline": true, "inputsInline": true,
"output": "Boolean", "output": Types.BOOLEAN.typeName,
"style": "logic_blocks", "style": "logic_blocks",
"helpUrl": "%{BKY_LOGIC_OPERATION_HELPURL}", "helpUrl": "%{BKY_LOGIC_OPERATION_HELPURL}",
"extensions": ["logic_op_tooltip"] "extensions": ["logic_op_tooltip"]
@ -151,10 +151,10 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{ {
"type": "input_value", "type": "input_value",
"name": "BOOL", "name": "BOOL",
"check": "Boolean" "check": Types.getCompatibleTypes('boolean'),
} }
], ],
"output": "Boolean", "output": Types.BOOLEAN.typeName,
"style": "logic_blocks", "style": "logic_blocks",
"tooltip": "%{BKY_LOGIC_NEGATE_TOOLTIP}", "tooltip": "%{BKY_LOGIC_NEGATE_TOOLTIP}",
"helpUrl": "%{BKY_LOGIC_NEGATE_HELPURL}" "helpUrl": "%{BKY_LOGIC_NEGATE_HELPURL}"
@ -176,7 +176,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{ {
"type": "input_value", "type": "input_value",
"name": "IF", "name": "IF",
"check": "Boolean" "check": Types.getCompatibleTypes('boolean'),
} }
], ],
"message1": "%{BKY_LOGIC_TERNARY_IF_TRUE} %1", "message1": "%{BKY_LOGIC_TERNARY_IF_TRUE} %1",

2
src/components/Blockly/helpers/types.js
View File

@ -18,7 +18,7 @@ export const CHARACTER = {
export const BOOLEAN = { export const BOOLEAN = {
typeId: 'Boolean', typeId: 'Boolean',
typeName: 'Boolean', typeName: 'boolean',
typeMsgName: 'ARD_TYPE_BOOL', typeMsgName: 'ARD_TYPE_BOOL',
} }