Skip to content

Commit

Permalink
Fixed all blockly declarations (to avoid warnings in logs)
Browse files Browse the repository at this point in the history
  • Loading branch information
@klein0r
klein0r committed Jun 7, 2024
1 parent 9a106ff commit 88ebfc4
Show file tree
Hide file tree
Showing 15 changed files with 616 additions and 862 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Executes Javascript, Typescript Scripts.
### **WORK IN PROGRESS**

* (klein0r) Ack flag on state object has priorty (in setState/setStateDelayed)
* (klein0r) Fixed all blockly declarations (to avoid warnings in logs)

### 8.4.3 (2024-06-04)

Expand Down
171 changes: 73 additions & 98 deletions src/public/google-blockly/own/blocks_action.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,16 @@ Blockly.Action = {
// --- action exec --------------------------------------------------

Blockly.Action.blocks['exec'] =
'<block type="exec">'
+ ' <value name="COMMAND">'
+ ' <shadow type="text">'
+ ' <field name="TEXT">pwd</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="LOG">'
+ ' </value>'
+ ' <value name="WITH_STATEMENT">'
+ ' </value>'
+ ' <mutation with_statement="false"></mutation>'
+ '</block>';
'<block type="exec">' +
' <mutation xmlns="http://www.w3.org/1999/xhtml" with_statement="false"></mutation>' +
' <field name="WITH_STATEMENT">FALSE</field>' +
' <field name="LOG"></field>' +
' <value name="COMMAND">' +
' <shadow type="text">' +
' <field name="TEXT">pwd</field>' +
' </shadow>' +
' </value>' +
'</block>';

Blockly.Blocks['exec'] = {
init: function() {
Expand Down Expand Up @@ -117,10 +115,9 @@ Blockly.JavaScript['exec'] = function(block) {

// --- exec_result -----------------------------------------------------------
Blockly.Action.blocks['exec_result'] =
'<block type="exec_result">'
+ ' <value name="ATTR">'
+ ' </value>'
+ '</block>';
'<block type="exec_result">' +
' <field name="ATTR">result</field>' +
'</block>';

Blockly.Blocks['exec_result'] = {
/**
Expand Down Expand Up @@ -183,21 +180,16 @@ Blockly.JavaScript['exec_result'] = function(block) {

// --- action http_get --------------------------------------------------
Blockly.Action.blocks['http_get'] =
'<block type="http_get">'
+ ' <value name="URL">'
+ ' <shadow type="text">'
+ ' <field name="TEXT">http://</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="TIMEOUT">'
+ ' </value>'
+ ' <value name="UNIT">'
+ ' </value>'
+ ' <value name="TYPE">'
+ ' </value>'
+ ' <value name="STATEMENT">'
+ ' </value>'
+ '</block>';
'<block type="http_get">' +
' <field name="TIMEOUT">2000</field>' +
' <field name="UNIT">ms</field>' +
' <field name="TYPE">text</field>' +
' <value name="URL">' +
' <shadow type="text">' +
' <field name="TEXT">http://</field>' +
' </shadow>' +
' </value>' +
'</block>';

Blockly.Blocks['http_get'] = {
init: function() {
Expand Down Expand Up @@ -256,25 +248,16 @@ Blockly.JavaScript['http_get'] = function(block) {

// --- action http_post --------------------------------------------------
Blockly.Action.blocks['http_post'] =
'<block type="http_post">'
+ ' <value name="URL">'
+ ' <shadow type="text">'
+ ' <field name="TEXT">http://</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="TIMEOUT">'
+ ' </value>'
+ ' <value name="UNIT">'
+ ' </value>'
+ ' <value name="TYPE">'
+ ' </value>'
+ ' <value name="DATA">'
+ ' <shadow type="logic_null">'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="STATEMENT">'
+ ' </value>'
+ '</block>';
'<block type="http_post">' +
' <field name="TIMEOUT">2000</field>' +
' <field name="UNIT">ms</field>' +
' <field name="TYPE">text</field>' +
' <value name="URL">' +
' <shadow type="text">' +
' <field name="TEXT">http://</field>' +
' </shadow>' +
' </value>' +
'</block>';

Blockly.Blocks['http_post'] = {
init: function() {
Expand Down Expand Up @@ -342,10 +325,9 @@ Blockly.JavaScript['http_post'] = function(block) {

// --- http_response -----------------------------------------------------------
Blockly.Action.blocks['http_response'] =
'<block type="http_response">'
+ ' <value name="ATTR">'
+ ' </value>'
+ '</block>';
'<block type="http_response">' +
' <field name="ATTR">response.data</field>' +
'</block>';

Blockly.Blocks['http_response'] = {
/**
Expand Down Expand Up @@ -409,20 +391,18 @@ Blockly.JavaScript['http_response'] = function(block) {

// --- action file_write --------------------------------------------------
Blockly.Action.blocks['file_write'] =
'<block type="file_write">'
+ ' <value name="OID">'
+ ' <shadow type="field_oid_meta">'
+ ' <field name="oid">0_userdata.0</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="FILE">'
+ ' <shadow type="text">'
+ ' <field name="TEXT">demo.json</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="DATA">'
+ ' </value>'
+ '</block>';
'<block type="file_write">' +
' <value name="OID">' +
' <shadow type="field_oid_meta">' +
' <field name="oid">0_userdata.0</field>' +
' </shadow>' +
' </value>' +
' <value name="FILE">' +
' <shadow type="text">' +
' <field name="TEXT">demo.json</field>' +
' </shadow>' +
' </value>' +
'</block>';

Blockly.Blocks['file_write'] = {
init: function() {
Expand Down Expand Up @@ -471,20 +451,18 @@ Blockly.JavaScript['file_write'] = function(block) {

// --- action file_read --------------------------------------------------
Blockly.Action.blocks['file_read'] =
'<block type="file_read">'
+ ' <value name="OID">'
+ ' <shadow type="field_oid_meta">'
+ ' <field name="oid">0_userdata.0</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="FILE">'
+ ' <shadow type="text">'
+ ' <field name="TEXT">demo.json</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="STATEMENT">'
+ ' </value>'
+ '</block>';
'<block type="file_read">' +
' <value name="OID">' +
' <shadow type="field_oid_meta">' +
' <field name="oid">0_userdata.0</field>' +
' </shadow>' +
' </value>' +
' <value name="FILE">' +
' <shadow type="text">' +
' <field name="TEXT">demo.json</field>' +
' </shadow>' +
' </value>' +
'</block>';

Blockly.Blocks['file_read'] = {
init: function() {
Expand Down Expand Up @@ -534,10 +512,9 @@ Blockly.JavaScript['file_read'] = function(block) {

// --- file_data -----------------------------------------------------------
Blockly.Action.blocks['file_data'] =
'<block type="file_data">'
+ ' <value name="ATTR">'
+ ' </value>'
+ '</block>';
'<block type="file_data">' +
' <field name="ATTR">data</field>' +
'</block>';

Blockly.Blocks['file_data'] = {
/**
Expand Down Expand Up @@ -599,18 +576,16 @@ Blockly.JavaScript['file_data'] = function(block) {

// --- action request --------------------------------------------------
Blockly.Action.blocks['request'] =
'<block type="request">'
+ ' <value name="URL">'
+ ' <shadow type="text">'
+ ' <field name="TEXT">http://</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="LOG">'
+ ' </value>'
+ ' <value name="WITH_STATEMENT">'
+ ' </value>'
+ ' <mutation with_statement="false"></mutation>'
+ '</block>';
'<block type="request">' +
' <mutation xmlns="http://www.w3.org/1999/xhtml" with_statement="false"></mutation>' +
' <field name="WITH_STATEMENT">FALSE</field>' +
' <field name="LOG"></field>' +
' <value name="URL">' +
' <shadow type="text">' +
' <field name="TEXT">http://</field>' +
' </shadow>' +
' </value>' +
'</block>';

Blockly.Blocks['request'] = {
init: function() {
Expand Down
Loading

0 comments on commit 88ebfc4

Please sign in to comment.