Blockly.JavaScript[..] -> Blockly.JavaScript.forBlock[..]

ioBroker · Jun 7, 2024 · 126112a · 126112a
1 parent 092ed0b
commit 126112a
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 85 deletions.
diff --git a/src/public/google-blockly/own/blocks_action.js b/src/public/google-blockly/own/blocks_action.js
@@ -87,7 +87,7 @@ Blockly.Blocks['exec'] = {
     }
 };
 
-Blockly.JavaScript['exec'] = function(block) {
+Blockly.JavaScript.forBlock['exec'] = function(block) {
     const value_command = Blockly.JavaScript.valueToCode(block, 'COMMAND', Blockly.JavaScript.ORDER_ATOMIC);
     const logLevel = block.getFieldValue('LOG');
     const withStatement = block.getFieldValue('WITH_STATEMENT');
@@ -172,7 +172,7 @@ Blockly.Blocks['exec_result'] = {
      */
     FUNCTION_TYPES: ['exec'],
 };
-Blockly.JavaScript['exec_result'] = function(block) {
+Blockly.JavaScript.forBlock['exec_result'] = function(block) {
     const attr = block.getFieldValue('ATTR');
 
     return [attr, Blockly.JavaScript.ORDER_ATOMIC];
@@ -224,7 +224,7 @@ Blockly.Blocks['http_get'] = {
     }
 };
 
-Blockly.JavaScript['http_get'] = function(block) {
+Blockly.JavaScript.forBlock['http_get'] = function(block) {
     const URL = Blockly.JavaScript.valueToCode(block, 'URL', Blockly.JavaScript.ORDER_ATOMIC);
     const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
     const unit = block.getFieldValue('UNIT');
@@ -298,7 +298,7 @@ Blockly.Blocks['http_post'] = {
     }
 };
 
-Blockly.JavaScript['http_post'] = function(block) {
+Blockly.JavaScript.forBlock['http_post'] = function(block) {
     const URL = Blockly.JavaScript.valueToCode(block, 'URL', Blockly.JavaScript.ORDER_ATOMIC);
     const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
     const unit = block.getFieldValue('UNIT');
@@ -386,7 +386,7 @@ Blockly.Blocks['http_response'] = {
      */
     FUNCTION_TYPES: ['http_get', 'http_post'],
 };
-Blockly.JavaScript['http_response'] = function(block) {
+Blockly.JavaScript.forBlock['http_response'] = function(block) {
     const attr = block.getFieldValue('ATTR');
 
     return [attr, Blockly.JavaScript.ORDER_ATOMIC];
@@ -429,7 +429,7 @@ Blockly.Blocks['file_write'] = {
     }
 };
 
-Blockly.JavaScript['file_write'] = function(block) {
+Blockly.JavaScript.forBlock['file_write'] = function(block) {
     const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const file = Blockly.JavaScript.valueToCode(block, 'FILE', Blockly.JavaScript.ORDER_ATOMIC);
     const data = Blockly.JavaScript.valueToCode(block, 'DATA', Blockly.JavaScript.ORDER_ATOMIC);
@@ -489,7 +489,7 @@ Blockly.Blocks['file_read'] = {
     }
 };
 
-Blockly.JavaScript['file_read'] = function(block) {
+Blockly.JavaScript.forBlock['file_read'] = function(block) {
     const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const file = Blockly.JavaScript.valueToCode(block, 'FILE', Blockly.JavaScript.ORDER_ATOMIC);
     const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
@@ -571,7 +571,7 @@ Blockly.Blocks['file_data'] = {
      */
     FUNCTION_TYPES: ['file_read'],
 };
-Blockly.JavaScript['file_data'] = function(block) {
+Blockly.JavaScript.forBlock['file_data'] = function(block) {
     const attr = block.getFieldValue('ATTR');
 
     return [attr, Blockly.JavaScript.ORDER_ATOMIC];
@@ -649,7 +649,7 @@ Blockly.Blocks['request'] = {
     }
 };
 
-Blockly.JavaScript['request'] = function(block) {
+Blockly.JavaScript.forBlock['request'] = function(block) {
     const logLevel = block.getFieldValue('LOG');
     const URL = Blockly.JavaScript.valueToCode(block, 'URL', Blockly.JavaScript.ORDER_ATOMIC);
     const withStatement = block.getFieldValue('WITH_STATEMENT');

diff --git a/src/public/google-blockly/own/blocks_logic.js b/src/public/google-blockly/own/blocks_logic.js
@@ -169,7 +169,7 @@ Blockly.Blocks['logic_multi_and'] = {
     },
 };
 
-Blockly.JavaScript['logic_multi_and'] = function(block) {
+Blockly.JavaScript.forBlock['logic_multi_and'] = function(block) {
     const ands = [];
     for (let n = 0; n < block.itemCount_; n++) {
         const condition = Blockly.JavaScript.valueToCode(block, 'AND' + n, Blockly.JavaScript.ORDER_ATOMIC);
@@ -346,7 +346,7 @@ Blockly.Blocks['logic_multi_or'] = {
     },
 };
 
-Blockly.JavaScript['logic_multi_or'] = function(block) {
+Blockly.JavaScript.forBlock['logic_multi_or'] = function(block) {
     const ors = [];
     for (let n = 0; n < block.itemCount_; n++) {
         const condition = Blockly.JavaScript.valueToCode(block, 'OR' + n, Blockly.JavaScript.ORDER_ATOMIC);
@@ -379,7 +379,7 @@ Blockly.Blocks['logic_between'] = {
     },
 };
 
-Blockly.JavaScript['logic_between'] = function(block) {
+Blockly.JavaScript.forBlock['logic_between'] = function(block) {
     const min = Blockly.JavaScript.valueToCode(block, 'MIN', Blockly.JavaScript.ORDER_RELATIONAL) || 0;
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_RELATIONAL) || 0;
     const max = Blockly.JavaScript.valueToCode(block, 'MAX', Blockly.JavaScript.ORDER_RELATIONAL) || 0;
@@ -410,7 +410,7 @@ Blockly.Blocks['logic_ifempty'] = {
     },
 };
 
-Blockly.JavaScript['logic_ifempty'] = function(block) {
+Blockly.JavaScript.forBlock['logic_ifempty'] = function(block) {
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_LOGICAL_OR) || null;
     const deflt = Blockly.JavaScript.valueToCode(block, 'DEFLT', Blockly.JavaScript.ORDER_LOGICAL_OR) || null;
 

diff --git a/src/public/google-blockly/own/blocks_number.js b/src/public/google-blockly/own/blocks_number.js
@@ -18,7 +18,7 @@ Blockly.Blocks['math_rndfixed'] = {
     },
 };
 
-Blockly.JavaScript['math_rndfixed'] = function(block) {
+Blockly.JavaScript.forBlock['math_rndfixed'] = function(block) {
     const x = Blockly.JavaScript.valueToCode(block, 'x', Blockly.JavaScript.ORDER_ATOMIC);
     const exp = Math.pow(10, block.getFieldValue('n'));
 

diff --git a/src/public/google-blockly/own/blocks_object.js b/src/public/google-blockly/own/blocks_object.js
@@ -223,7 +223,7 @@ Blockly.Blocks['object_new'] = {
     },
 };
 
-Blockly.JavaScript['object_new'] = function(block) {
+Blockly.JavaScript.forBlock['object_new'] = function(block) {
     const attributes = [];
     for (let n = 0; n < block.itemCount_; n++) {
         const val = Blockly.JavaScript.valueToCode(block, 'ATTR_' + n, Blockly.JavaScript.ORDER_COMMA);
@@ -269,7 +269,7 @@ Blockly.Blocks['object_set_attr'] = {
     },
 };
 
-Blockly.JavaScript['object_set_attr'] = function(block) {
+Blockly.JavaScript.forBlock['object_set_attr'] = function(block) {
     let obj  = Blockly.JavaScript.valueToCode(block, 'OBJECT', Blockly.JavaScript.ORDER_ATOMIC);
     const attr = block.getFieldValue('ATTR');
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
@@ -306,7 +306,7 @@ Blockly.Blocks['object_del_attr'] = {
     },
 };
 
-Blockly.JavaScript['object_del_attr'] = function(block) {
+Blockly.JavaScript.forBlock['object_del_attr'] = function(block) {
     let obj  = Blockly.JavaScript.valueToCode(block, 'OBJECT', Blockly.JavaScript.ORDER_ATOMIC);
     const attr = block.getFieldValue('ATTR');
 
@@ -346,7 +346,7 @@ Blockly.Blocks['object_has_attr'] = {
     }
 };
 
-Blockly.JavaScript['object_has_attr'] = function(block) {
+Blockly.JavaScript.forBlock['object_has_attr'] = function(block) {
     const obj  = Blockly.JavaScript.valueToCode(block, 'OBJECT', Blockly.JavaScript.ORDER_ATOMIC);
     const attr = block.getFieldValue('ATTR');
 
@@ -377,7 +377,7 @@ Blockly.Blocks['object_keys'] = {
     },
 };
 
-Blockly.JavaScript['object_keys'] = function(block) {
+Blockly.JavaScript.forBlock['object_keys'] = function(block) {
     let obj = Blockly.JavaScript.valueToCode(block, 'OBJECT', Blockly.JavaScript.ORDER_ATOMIC);
 
     if (!obj) {

diff --git a/src/public/google-blockly/own/blocks_procedures.js b/src/public/google-blockly/own/blocks_procedures.js
@@ -171,7 +171,7 @@ Blockly.Procedures.flyoutCategoryNew = function(workspace) {
 
 // ---------------------- patch for async functions ------------------------------
 // taken from javascript/procedures.js https://github.com/google/blockly/blob/blockly-v9.3.3/generators/javascript/procedures.js
-Blockly.JavaScript['procedures_defreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_defreturn'] = function(block) {
     // Define a procedure with a return value.
     const funcName = Blockly.JavaScript.nameDB_.getName(
         block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
@@ -215,9 +215,9 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) {
     return null;
 };
 
-Blockly.JavaScript['procedures_defnoreturn'] = Blockly.JavaScript['procedures_defreturn'];
+Blockly.JavaScript.forBlock['procedures_defnoreturn'] = Blockly.JavaScript.forBlock['procedures_defreturn'];
 
-Blockly.JavaScript['procedures_callreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_callreturn'] = function(block) {
     // Call a procedure with a return value.
     const funcName = Blockly.JavaScript.nameDB_.getName(
         block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
@@ -392,7 +392,7 @@ Blockly.Blocks['procedures_defcustomreturn'] = {
     callType_: 'procedures_callcustomreturn'
 };
 
-Blockly.JavaScript['procedures_defcustomreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_defcustomreturn'] = function(block) {
     // Define a procedure with a return value.
     const funcName = Blockly.JavaScript.nameDB_.getName(
         block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
@@ -433,7 +433,7 @@ Blockly.Blocks['procedures_callcustomreturn'] = {
     defType_: 'procedures_defcustomreturn'
 };
 
-Blockly.JavaScript['procedures_callcustomreturn'] = Blockly.JavaScript['procedures_callreturn'];
+Blockly.JavaScript.forBlock['procedures_callcustomreturn'] = Blockly.JavaScript.forBlock['procedures_callreturn'];
 
 // ---------------------- custom function with no return ------------------------------
 
@@ -496,7 +496,7 @@ Blockly.Blocks['procedures_defcustomnoreturn'] = {
     callType_: 'procedures_callcustomnoreturn'
 };
 
-Blockly.JavaScript['procedures_defcustomnoreturn'] = Blockly.JavaScript['procedures_defcustomreturn'];
+Blockly.JavaScript.forBlock['procedures_defcustomnoreturn'] = Blockly.JavaScript.forBlock['procedures_defcustomreturn'];
 
 Blockly.Blocks['procedures_callcustomnoreturn'] = {
     init: Blockly.Blocks['procedures_callnoreturn'].init,
@@ -513,10 +513,10 @@ Blockly.Blocks['procedures_callcustomnoreturn'] = {
     defType_: 'procedures_defcustomnoreturn'
 };
 
-Blockly.JavaScript['procedures_callcustomnoreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_callcustomnoreturn'] = function(block) {
     // Call a procedure with no return value.
     // Generated code is for a function call as a statement is the same as a
     // function call as a value, with the addition of line ending.
-    const tuple = Blockly.JavaScript['procedures_callcustomreturn'](block);
+    const tuple = Blockly.JavaScript.forBlock['procedures_callcustomreturn'](block);
     return tuple[0] + ';\n';
 };
diff --git a/src/public/google-blockly/own/blocks_sendto.js b/src/public/google-blockly/own/blocks_sendto.js
@@ -309,7 +309,7 @@ Blockly.Blocks['sendto_custom'] = {
     },
 };
 
-Blockly.JavaScript['sendto_custom'] = function (block) {
+Blockly.JavaScript.forBlock['sendto_custom'] = function (block) {
     const instance      = block.getFieldValue('INSTANCE');
     const logLevel      = block.getFieldValue('LOG');
     const command       = block.getFieldValue('COMMAND');
@@ -425,7 +425,7 @@ Blockly.Blocks['sendto_otherscript'] = {
     },
 };
 
-Blockly.JavaScript['sendto_otherscript'] = function(block) {
+Blockly.JavaScript.forBlock['sendto_otherscript'] = function(block) {
     const dropdown_instance = block.getFieldValue('INSTANCE');
     const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const message = block.getFieldValue('MESSAGE');
@@ -554,7 +554,7 @@ Blockly.Blocks['sendto_gethistory'] = {
     },
 };
 
-Blockly.JavaScript['sendto_gethistory'] = function(block) {
+Blockly.JavaScript.forBlock['sendto_gethistory'] = function(block) {
     const dropdown_instance = block.getFieldValue('INSTANCE');
     const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const start = Blockly.JavaScript.valueToCode(block, 'START', Blockly.JavaScript.ORDER_ATOMIC);

diff --git a/src/public/google-blockly/own/blocks_switch.js b/src/public/google-blockly/own/blocks_switch.js
@@ -189,7 +189,7 @@ Blockly.Blocks['case_default'] = {
     },
 };
 
-Blockly.JavaScript['logic_switch_case'] = function (block) {
+Blockly.JavaScript.forBlock['logic_switch_case'] = function (block) {
     let code = '';
     let do_n;
     let case_n;