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

Merge branch 'master' into feat/blockly-gallery

Browse Source
This commit is contained in:
Mario Pesch
2020-10-20 10:49:31 +02:00
committed by GitHub
parent 61ca2e8799 f95beb9623
commit 0a459938a8
26 changed files with 199 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Blockly/BlocklySvg.js
+7 -1
View File
@@ -42,7 +42,13 @@ class BlocklySvg extends Component {
// https://github.com/google/blockly/pull/3431/files#diff-00254795773903d3c0430915a68c9521R328
cssContent += `.blocklyPath {
fill-opacity: 1;
} `;
}
.blocklyPathDark {
display: flex;
}
.blocklyPathLight {
display: flex;
} `;
var css = '<defs><style type="text/css" xmlns="http://www.w3.org/1999/xhtml"><![CDATA[' + cssContent + ']]></style></defs>';
var bbox = document.getElementsByClassName("blocklyBlockCanvas")[0].getBBox();
src/components/Blockly/blocks/logic.js
+10 -10
View File
@@ -19,7 +19,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
]
}
],
"output": "Boolean",
"output": Types.BOOLEAN.typeName,
"style": "logic_blocks",
"tooltip": "%{BKY_LOGIC_BOOLEAN_TOOLTIP}",
"helpUrl": "%{BKY_LOGIC_BOOLEAN_HELPURL}"
@@ -32,7 +32,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "IF0",
"check": "Boolean"
"check": Types.getCompatibleTypes('boolean')
}
],
"message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1",
@@ -57,7 +57,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "IF0",
"check": "Boolean"
"check": Types.getCompatibleTypes('boolean')
}
],
"message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1",
@@ -108,7 +108,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
}
],
"inputsInline": true,
"output": "Boolean",
"output": Types.BOOLEAN.typeName,
"style": "logic_blocks",
"helpUrl": "%{BKY_LOGIC_COMPARE_HELPURL}",
"extensions": ["logic_compare", "logic_op_tooltip"]
@@ -121,7 +121,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "A",
"check": "Boolean"
"check": Types.getCompatibleTypes('boolean')
},
{
"type": "field_dropdown",
@@ -134,11 +134,11 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "B",
"check": "Boolean"
"check": Types.getCompatibleTypes('boolean')
}
],
"inputsInline": true,
"output": "Boolean",
"output": Types.BOOLEAN.typeName,
"style": "logic_blocks",
"helpUrl": "%{BKY_LOGIC_OPERATION_HELPURL}",
"extensions": ["logic_op_tooltip"]
@@ -151,10 +151,10 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "BOOL",
"check": "Boolean"
"check": Types.getCompatibleTypes('boolean'),
}
],
"output": "Boolean",
"output": Types.BOOLEAN.typeName,
"style": "logic_blocks",
"tooltip": "%{BKY_LOGIC_NEGATE_TOOLTIP}",
"helpUrl": "%{BKY_LOGIC_NEGATE_HELPURL}"
@@ -176,7 +176,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "IF",
"check": "Boolean"
"check": Types.getCompatibleTypes('boolean'),
}
],
"message1": "%{BKY_LOGIC_TERNARY_IF_TRUE} %1",
src/components/Blockly/helpers/types.js
+1 -1
View File
@@ -18,7 +18,7 @@ export const CHARACTER = {
export const BOOLEAN = {
typeId: 'Boolean',
typeName: 'Boolean',
typeName: 'boolean',
typeMsgName: 'ARD_TYPE_BOOL',
}