Skip to content

Commit

Permalink
"Object ID" returns string and should be green (as text blocks)
Browse files Browse the repository at this point in the history
  • Loading branch information
klein0r committed Jul 4, 2023
1 parent 964e038 commit 0205688
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/public/google-blockly/own/blocks_system.js
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,8 @@ Blockly.System.blocks['get_value_var'] =
+ ' <value name="ATTR">'
+ ' </value>'
+ ' <value name="OID">'
+ ' <shadow type="text">'
+ ' <field name="OID">zigbee.0.1234</field>'
+ ' <shadow type="field_oid">'
+ ' <field name="oid">Object ID</field>'
+ ' </shadow>'
+ ' </value>'
+ '</block>';
Expand Down Expand Up @@ -1018,7 +1018,7 @@ Blockly.Blocks['field_oid'] = {
.appendField(new Blockly.FieldOID('default'), 'oid');

this.setInputsInline(true);
this.setColour(Blockly.System.HUE);
this.setColour("%{BKY_TEXTS_HUE}");
this.setOutput(true, 'String');
this.setTooltip(Blockly.Translate('field_oid_tooltip'));
}
Expand Down Expand Up @@ -1046,7 +1046,7 @@ Blockly.Blocks['field_oid_meta'] = {
.appendField(new Blockly.FieldOID('default', 'meta'), 'oid');

this.setInputsInline(true);
this.setColour(Blockly.System.HUE);
this.setColour("%{BKY_TEXTS_HUE}");
this.setOutput(true, 'String');
this.setTooltip(Blockly.Translate('field_oid_tooltip'));
}
Expand Down Expand Up @@ -1074,7 +1074,7 @@ Blockly.Blocks['field_oid_script'] = {
.appendField(new Blockly.FieldOID('default', 'script'), 'oid');

this.setInputsInline(true);
this.setColour(Blockly.System.HUE);
this.setColour("%{BKY_TEXTS_HUE}");
this.setOutput(true, 'String');
this.setTooltip(Blockly.Translate('field_oid_tooltip'));
}
Expand Down
2 changes: 1 addition & 1 deletion src/public/google-blockly/own/blocks_text.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Blockly.Blocks['text_newline'] = {
this.appendDummyInput()
.appendField(new Blockly.FieldDropdown([['\\n', '\\n'], ['\\r\\n', '\\r\\n'], ['\\r', '\\r']]), 'Type');
this.setInputsInline(true);
this.setColour(Blockly.Msg['TEXTS_HUE']);
this.setColour("%{BKY_TEXTS_HUE}");
this.setOutput(true, 'String');
this.setTooltip(Blockly.Translate('text_newline_tooltip'));
}
Expand Down

0 comments on commit 0205688

Please sign in to comment.