iobroker.javascript 7.0.5 → 7.0.8

package/admin/google-blockly/own/blocks_trigger.js

@@ -85,7 +85,6 @@ Blockly.Blocks['on_ext'] = {
     mutationToDom: function () {
         const container = document.createElement('mutation');
         container.setAttribute('items', this.itemCount_);
-
         return container;
     },
     /**
@@ -106,7 +105,6 @@ Blockly.Blocks['on_ext'] = {
     decompose: function (workspace) {
         const containerBlock = workspace.newBlock('on_ext_oid_container');
         containerBlock.initSvg();
-
         let connection = containerBlock.getInput('STACK').connection;
         for (let i = 0; i < this.itemCount_; i++) {
             const itemBlock = workspace.newBlock('on_ext_oid');
@@ -114,7 +112,6 @@ Blockly.Blocks['on_ext'] = {
             connection.connect(itemBlock.previousConnection);
             connection = itemBlock.nextConnection;
         }
-
         return containerBlock;
     },
     /**
@@ -131,19 +128,18 @@ Blockly.Blocks['on_ext'] = {
             itemBlock = itemBlock.nextConnection &&
                 itemBlock.nextConnection.targetBlock();
         }
-
         // Disconnect any children that don't belong.
         for (let k = 0; k < this.itemCount_; k++) {
-            var connection = this.getInput('OID' + k).connection.targetConnection;
+            const connection = this.getInput('OID' + k).connection.targetConnection;
             if (connection && connections.indexOf(connection) === -1) {
                 connection.disconnect();
             }
         }
-
         this.itemCount_ = connections.length;
-        if (this.itemCount_ < 1) this.itemCount_ = 1;
+        if (this.itemCount_ < 1) {
+            this.itemCount_ = 1;
+        }
         this.updateShape_();
-
         // Reconnect any child blocks.
         for (let i = 0; i < this.itemCount_; i++) {
             Blockly.Mutator.reconnect(connections[i], this, 'OID' + i);
@@ -157,9 +153,8 @@ Blockly.Blocks['on_ext'] = {
     saveConnections: function(containerBlock) {
         let itemBlock = containerBlock.getInputTargetBlock('STACK');
         let i = 0;
-
         while (itemBlock) {
-            var input = this.getInput('OID' + i);
+            const input = this.getInput('OID' + i);
             itemBlock.valueConnection_ = input && input.connection.targetConnection;
             i++;
             itemBlock = itemBlock.nextConnection &&
@@ -191,7 +186,8 @@ Blockly.Blocks['on_ext'] = {
         // Add new inputs.
         const wp = this.workspace;
 
-        for (var i = 0; i < this.itemCount_; i++) {
+        let i;
+        for (i = 0; i < this.itemCount_; i++) {
             let _input = this.getInput('OID' + i);
             if (!_input) {
                 _input = this.appendValueInput('OID' + i);
@@ -220,7 +216,6 @@ Blockly.Blocks['on_ext'] = {
                 }, 100, _input);
             }
         }
-
         // Remove deleted inputs.
         while (this.getInput('OID' + i)) {
             this.removeInput('OID' + i);
@@ -257,14 +252,13 @@ Blockly.Blocks['on_ext'] = {
 };
 Blockly.JavaScript['on_ext'] = function(block) {
     const dropdown_condition = block.getFieldValue('CONDITION');
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
     const ack_condition = block.getFieldValue('ACK_CONDITION');
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
-
     let val;
     if (dropdown_condition === 'true' || dropdown_condition === 'false') {
         val = 'val: ' + dropdown_condition;
     } else {
-        val = `change: '${dropdown_condition}'`;
+        val = 'change: "' + dropdown_condition + '"';
     }
 
     const oids = [];
@@ -280,12 +274,12 @@ Blockly.JavaScript['on_ext'] = function(block) {
             }
         }
     }
-
     const oid = '[].concat(' + oids.join(').concat(') + ')';
 
-    return `on({ id: ${oid}, ${val} ${ack_condition ? ', ack: ' + ack_condition : ''} }, async (obj) => {\n` +
+    const code = 'on({ id: ' + oid + ', '  + val + (ack_condition ? ', ack: ' + ack_condition : '') + ' }, async (obj) => {\n' +
         (oids.length === 1 ? Blockly.JavaScript.prefixLines('let value = obj.state.val;\nlet oldValue = obj.oldState.val;', Blockly.JavaScript.INDENT) + '\n' : '') +
-        statement + '});\n';
+        statements_name + '});\n';
+    return code;
 };
 
 // --- ON -----------------------------------------------------------
@@ -344,8 +338,8 @@ Blockly.JavaScript['on'] = function(block) {
     const value_objectid = block.getFieldValue('OID');
     const dropdown_condition = block.getFieldValue('CONDITION');
     const ack_condition = block.getFieldValue('ACK_CONDITION');
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
-    const objectName = main.objects[value_objectid] && main.objects[value_objectid].common && main.objects[value_objectid].common.name ? main.objects[value_objectid].common.name : '';
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const objectname = main.objects[value_objectid] && main.objects[value_objectid].common && main.objects[value_objectid].common.name ? main.objects[value_objectid].common.name : '';
 
     Blockly.Msg.VARIABLES_DEFAULT_NAME = 'value';
 
@@ -353,13 +347,13 @@ Blockly.JavaScript['on'] = function(block) {
     if (dropdown_condition === 'true' || dropdown_condition === 'false') {
         val = 'val: ' + dropdown_condition;
     } else {
-        val = `change: '${dropdown_condition}'`;
+        val = 'change: "' + dropdown_condition + '"';
     }
 
-    return `on({ id: '${value_objectid}'${objectName ? ` /* ${objectName} */` : ''}, ${val} ${ack_condition ? ', ack: ' + ack_condition : ''} }, async (obj) => {\n` +
-        Blockly.JavaScript.prefixLines('let value = obj.state.val;', Blockly.JavaScript.INDENT) + '\n' +
+    return 'on({ id: "' + value_objectid + '"' + (objectname ? '/*' + objectname + '*/' : '') + ', '  + val + (ack_condition ? ', ack: ' + ack_condition : '') + ' }, async (obj) => {\n' +
+        Blockly.JavaScript.prefixLines('let value = obj.state.val;\n', Blockly.JavaScript.INDENT) + '\n' +
         Blockly.JavaScript.prefixLines('let oldValue = obj.oldState.val;', Blockly.JavaScript.INDENT) + '\n' +
-        statement +
+        + statements_name +
         '});\n';
 };
 
@@ -376,7 +370,6 @@ Blockly.Blocks['on_source'] = {
      * @this Blockly.Block
      */
     init: function() {
-
         this.appendDummyInput()
             .appendField('↪');
 
@@ -404,7 +397,7 @@ Blockly.Blocks['on_source'] = {
                 [Blockly.Translate('on_source_oldstate_ack'),   'oldState.ack'],
                 [Blockly.Translate('on_source_oldstate_lc'),    'oldState.lc'],
                 [Blockly.Translate('on_source_oldstate_c'),     'oldState.c'],
-                [Blockly.Translate('on_source_oldstate_user'),  'oldState.user']
+                [Blockly.Translate('on_source_oldstate_user'),    'oldState.user']
             ]), 'ATTR');
 
         this.setInputsInline(true);
@@ -424,7 +417,7 @@ Blockly.Blocks['on_source'] = {
         // Is the block nested in a trigger?
         let block = this;
         do {
-            if (this.FUNCTION_TYPES.indexOf(block.type) !== -1) {
+            if (this.FUNCTION_TYPES.includes(block.type)) {
                 legal = true;
                 break;
             }
@@ -447,13 +440,11 @@ Blockly.Blocks['on_source'] = {
 Blockly.JavaScript['on_source'] = function(block) {
     let attr = block.getFieldValue('ATTR');
     const parts = attr.split('.');
-
     if (parts.length > 1) {
         attr = '(obj.' + parts[0] + ' ? obj.' + attr + ' : "")';
     } else {
         attr = 'obj.' + attr;
     }
-
     return [attr, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
@@ -461,6 +452,9 @@ Blockly.JavaScript['on_source'] = function(block) {
 Blockly.Trigger.blocks['schedule'] =
     '<block type="schedule">'
     + '     <value name="SCHEDULE">'
+    //+ '         <shadow type="text">'
+    //+ '             <field name="TEXT">test</field>'
+    //+ '         </shadow>'
     + '     </value>'
     + '     <value name="STATEMENT">'
     + '     </value>'
@@ -487,16 +481,15 @@ Blockly.Blocks['schedule'] = {
 };
 Blockly.JavaScript['schedule'] = function(block) {
     let schedule = block.getFieldValue('SCHEDULE');
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
     if (schedule[0] === '{') {
         schedule = "'" + schedule + "'";
     } else {
         schedule = '"' + schedule + '"';
     }
-
-    return `schedule(${schedule}, async () => {\n` +
-        statement +
+    return 'schedule(' + schedule + ', async () => {\n' +
+        statements_name +
         '});\n';
 };
 
@@ -559,11 +552,11 @@ Blockly.Blocks['astro'] = {
 };
 Blockly.JavaScript['astro'] = function(block) {
     const astrotype = block.getFieldValue('TYPE');
-    const offset = parseInt(block.getFieldValue('OFFSET'), 10);
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const offset    = parseInt(block.getFieldValue('OFFSET'), 10);
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return `schedule({ astro: '${astrotype}', shift: ${offset} }, async () => {\n` +
-        statement +
+    return 'schedule({ astro: "' + astrotype + '", shift: ' + offset + ' }, async () => {\n' +
+        statements_name +
         '});\n';
 };
 
@@ -683,10 +676,10 @@ Blockly.Blocks['schedule_create'] = {
 Blockly.JavaScript['schedule_create'] = function (block) {
     const name  = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
     const schedule = Blockly.JavaScript.valueToCode(block, 'SCHEDULE', Blockly.JavaScript.ORDER_ATOMIC);
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
     return name + ' = schedule(' + schedule + ', async () => {\n' +
-        statement +
+        statements_name +
         '});\n';
 };
 
@@ -741,7 +734,7 @@ Blockly.Blocks['schedule_clear'] = {
 
 Blockly.JavaScript['schedule_clear'] = function(block) {
     const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
-    return `(function () { if (${name}) { clearSchedule(${name}); ${name} = null; }})();\n`;
+    return '(function () { if (' + name + ') { clearSchedule(' + name + '); ' + name + ' = null; }})();\n';
 };
 
 // --- CRON dialog --------------------------------------------------
@@ -769,7 +762,7 @@ Blockly.Blocks['field_cron'] = {
 
 Blockly.JavaScript['field_cron'] = function(block) {
     const cron = block.getFieldValue('CRON');
-    return [`'${cron}'`, Blockly.JavaScript.ORDER_ATOMIC]
+    return ['\'' + cron + '\'', Blockly.JavaScript.ORDER_ATOMIC]
 };
 
 // --- CRON builder --------------------------------------------------
@@ -795,7 +788,6 @@ Blockly.Trigger.blocks['cron_builder'] =
 Blockly.Blocks['cron_builder'] = {
     // Checkbox.
     init: function() {
-
         this.appendDummyInput()
             .appendField(Blockly.Translate('cron_builder_CRON'));
 
@@ -805,10 +797,10 @@ Blockly.Blocks['cron_builder'] = {
                 this.sourceBlock_.setInputsInline(option === true || option === 'true' || option === 'TRUE');
             }), 'LINE');
 
-        const _input = this.appendValueInput('DOW')
+        let _input = this.appendValueInput('DOW')
             .appendField(Blockly.Translate('cron_builder_dow'));
 
-            const wp = this.workspace;
+        const wp = this.workspace;
         setTimeout(function (_input) {
             if (!_input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
@@ -841,7 +833,6 @@ Blockly.Blocks['cron_builder'] = {
             }
         }, 100, _input);
 
-
         _input = this.appendValueInput('HOURS')
             .appendField(Blockly.Translate('cron_builder_hour'));
         setTimeout(function (_input) {
@@ -853,7 +844,6 @@ Blockly.Blocks['cron_builder'] = {
             }
         }, 100, _input);
 
-
         _input = this.appendValueInput('MINUTES')
             .appendField(Blockly.Translate('cron_builder_minutes'));
         setTimeout(function (_input) {
@@ -888,7 +878,6 @@ Blockly.Blocks['cron_builder'] = {
         const container = document.createElement('mutation');
         container.setAttribute('seconds', this.seconds_);
         container.setAttribute('as_line', this.as_line_);
-
         return container;
     },
     /**
@@ -946,7 +935,6 @@ Blockly.JavaScript['cron_builder'] = function(block) {
         days    + '.toString().trim() + \' \' + ' +
         months  + '.toString().trim() + \' \' + ' +
         dow     + '.toString().trim()';
-
     return [code, Blockly.JavaScript.ORDER_ATOMIC]
 };
 
@@ -984,10 +972,10 @@ Blockly.Blocks['onMessage'] = {
 
 Blockly.JavaScript['onMessage'] = function (block) {
     const message = block.getFieldValue('MESSAGE');
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return `onMessage('${message}', async (data) => {\n` +
-        statement +
+    return 'onMessage("' + message + '", async (data) => {\n' +
+        statements_name +
         '});\n';
 };
 
@@ -1035,18 +1023,16 @@ Blockly.Blocks['onFile'] = {
         this.setHelpUrl(getHelp('onFile_help'));
     }
 };
-
 Blockly.JavaScript['onFile'] = 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 withFile = block.getFieldValue('WITH_FILE');
-    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
-    const objectName = main.objects[value_objectid] && main.objects[value_objectid].common && main.objects[value_objectid].common.name ? main.objects[value_objectid].common.name : '';
+    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const objectname = main.objects[value_objectid] && main.objects[value_objectid].common && main.objects[value_objectid].common.name ? main.objects[value_objectid].common.name : '';
 
-    return `onFile(${value_objectid}${objectName ? ` /* ${objectName} */` : ''}, ${file}, ${withFile === 'TRUE' ? 'true' : 'false'}, ` +
-        'async (id, fileName, size, data, mimeType) => {\n' +
-        statement +
-        '});\n';
+    return 'onFile(' + value_objectid + (objectname ? '/*' + objectname + '*/' : '') + ', ' +
+        file + ', ' + (withFile === 'TRUE' ? 'true' : 'false') +
+        ', async (id, fileName, size, data, mimeType) => {\n' + statements_name + '});\n';
 };
 
 // --- onFile -----------------------------------------------------------
@@ -1081,11 +1067,10 @@ Blockly.Blocks['offFile'] = {
         this.setHelpUrl(getHelp('offFile_help'));
     }
 };
-
 Blockly.JavaScript['offFile'] = 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 objectName = main.objects[value_objectid] && main.objects[value_objectid].common && main.objects[value_objectid].common.name ? main.objects[value_objectid].common.name : '';
+    const objectname = main.objects[value_objectid] && main.objects[value_objectid].common && main.objects[value_objectid].common.name ? main.objects[value_objectid].common.name : '';
 
-    return `offFile(${value_objectid}${objectName ? ` /* ${objectName} */` : ''}, ${file});\n`;
-};
+    return 'offFile(' + value_objectid + (objectname ? '/*' + objectname + '*/' : '') + ', ' + file + ');\n';
+};

package/admin/google-blockly/own/blocks_words.js

@@ -444,17 +444,16 @@ Blockly.Words['onMessage_message']                    = {'en': 'message',
 Blockly.Words['onMessage_tooltip']                    = {'en': 'message',                                         'de': 'Meldung',                                         'ru': 'сообщение',                                       'pt': 'mensagem',                                        'nl': 'bericht',                                         'fr': 'message',                                         'it': 'messaggio',                                       'es': 'mensaje',                                         'pl': 'komunikat',                                       'zh-cn': '消息',                                              'uk': 'повідомлення'};
 Blockly.Words['onMessage_help']                       = {'en': 'onMessage',                                       'de': 'onMessage',                                       'ru': 'onMessage',                                       'pt': 'onMessage',                                       'nl': 'onMessage',                                       'fr': 'onMessage',                                       'it': 'onMessage',                                       'es': 'onMessage',                                       'pl': 'onMessage',                                       'zh-cn': 'onMessage',                                       'uk': 'onMessage'};
 
-// --- logic between --------------------------------------------------
-Blockly.Words['logic_between_min'] = { "en": "Min",     "de": "Min",     "ru": "Мин",     "pt": "Min",     "nl": "Min",     "fr": "Min",     "it": "Min",     "es": "Min",     "pl": "Min",     "uk": "Мінуси",     "zh-cn": "明 明" };
-Blockly.Words['logic_between_max'] = { "en": "Max",     "de": "Max",     "ru": "Макс",     "pt": "Max",     "nl": "Max",     "fr": "Max",     "it": "Max",     "es": "Max",     "pl": "Max",     "uk": "Макс",     "zh-cn": "Max" };
+// --- OTHER --------------------------------------------------
+Blockly.Words['Other']                                = {'en': 'Other',                                           'de': 'Sonstige',                                        'ru': 'Другое',                                          'pt': 'Outros',                                          'nl': 'Andere',                                          'fr': 'Autres',                                          'it': 'Altri',                                           'es': 'Otros',                                           'pl': 'Inny',                                            'zh-cn': '其他',                                            'uk': 'Інше'};
 
-// --- logic ifempty --------------------------------------------------
-Blockly.Words['logic_ifempty'] = { "en": "if empty",     "de": "wenn leer",     "ru": "если пусто",     "pt": "se vazio",     "nl": "_",     "fr": "si vide",     "it": "se vuoto",     "es": "si está vacío",     "pl": "jeśli chodzi o puste",     "uk": "якщо порожній",     "zh-cn": "空" };
-Blockly.Words['logic_ifempty_then'] = { "en": "then",     "de": "dann",     "ru": "затем",     "pt": "então",     "nl": "dan",     "fr": "puis",     "it": "allora",     "es": "entonces",     "pl": "potem",     "uk": "потім",     "zh-cn": "然后" };
+// --- other between --------------------------------------------------
+Blockly.Words['other_between_min'] = { "en": "Min",     "de": "Min",     "ru": "Мин",     "pt": "Min",     "nl": "Min",     "fr": "Min",     "it": "Min",     "es": "Min",     "pl": "Min",     "uk": "Мінуси",     "zh-cn": "明 明" };
+Blockly.Words['other_between_max'] = { "en": "Max",     "de": "Max",     "ru": "Макс",     "pt": "Max",     "nl": "Max",     "fr": "Max",     "it": "Max",     "es": "Max",     "pl": "Max",     "uk": "Макс",     "zh-cn": "Max" };
 
-function getHelp(word) {
-    return 'https://github.com/ioBroker/ioBroker.javascript/blob/master/docs/en/javascript.md#' + Blockly.Words[word][systemLang];
-}
+// --- other_ifempty --------------------------------------------------
+Blockly.Words['other_ifempty'] = { "en": "if empty",     "de": "wenn leer",     "ru": "если пусто",     "pt": "se vazio",     "nl": "_",     "fr": "si vide",     "it": "se vuoto",     "es": "si está vacío",     "pl": "jeśli chodzi o puste",     "uk": "якщо порожній",     "zh-cn": "空" };
+Blockly.Words['other_ifempty_then'] = { "en": "then",     "de": "dann",     "ru": "затем",     "pt": "então",     "nl": "dan",     "fr": "puis",     "it": "allora",     "es": "entonces",     "pl": "potem",     "uk": "потім",     "zh-cn": "然后" };
 
 Blockly.Translate = function (word, lang) {
     lang = lang || systemLang;