iobroker.javascript 7.0.8 → 7.1.0

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

@@ -113,13 +113,15 @@ Blockly.Blocks['timeouts_wait'] = {
 };
 
 Blockly.JavaScript['timeouts_wait'] = function(block) {
+    const unit = block.getFieldValue('UNIT');
+
     let delay = block.getFieldValue('DELAY');
-    const unit  = block.getFieldValue('UNIT');
     if (unit === 'min') {
         delay *= 60000;
     } else if (unit === 'sec') {
         delay *= 1000;
     }
+
     return 'await wait(' + delay + ');\n';
 };
 
@@ -172,23 +174,25 @@ Blockly.Blocks['timeouts_settimeout'] = {
     },
     getVarModels: function () {
         const name = this.getFieldValue('NAME');
-        return [{getId: function () {return name;}, name: name, type: 'timeout'}];
+        return [{ getId: () => { return name; }, name: name, type: 'timeout' }];
     }
 };
 
 Blockly.JavaScript['timeouts_settimeout'] = function(block) {
+    const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
+    const unit = block.getFieldValue('UNIT');
+
     let delay = block.getFieldValue('DELAY');
-    const name  = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
-    const unit  = block.getFieldValue('UNIT');
     if (unit === 'min') {
         delay *= 60000;
     } else if (unit === 'sec') {
         delay *= 1000;
     }
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
-    return name + ' = setTimeout(async function () {\n' +
+
+    const statements = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    return name + ' = setTimeout(async () => {\n' +
         Blockly.JavaScript.prefixLines(name + ' = null;', Blockly.JavaScript.INDENT) + '\n' +
-        statements_name +
+        statements +
         '}, ' + delay + ');\n';
 };
 
@@ -239,18 +243,18 @@ Blockly.Blocks['timeouts_settimeout_variable'] = {
     },
     getVarModels: function () {
         const name = this.getFieldValue('NAME');
-        return [{getId: function () {return name;}, name: name, type: 'timeout'}];
+        return [{ getId: () => { return name; }, name: name, type: 'timeout' }];
     }
 };
 
 Blockly.JavaScript['timeouts_settimeout_variable'] = function(block) {
     const delay = Blockly.JavaScript.valueToCode(block, 'DELAY_MS', Blockly.JavaScript.ORDER_ATOMIC);
-    const name  = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
+    const statements = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return name + ' = setTimeout(async function () {\n' +
+    return name + ' = setTimeout(async () => {\n' +
         Blockly.JavaScript.prefixLines(name + ' = null;', Blockly.JavaScript.INDENT) + '\n' +
-        statements_name +
+        statements +
         '}, parseInt(' + delay + '));\n';
 };
 
@@ -305,7 +309,7 @@ Blockly.Blocks['timeouts_cleartimeout'] = {
 
 Blockly.JavaScript['timeouts_cleartimeout'] = function(block) {
     const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
-    return '(function () { if (' + name + ') { clearTimeout(' + name + '); ' + name + ' = null; }})();\n';
+    return '(() => { if (' + name + ') { clearTimeout(' + name + '); ' + name + ' = null; }})();\n';
 };
 
 // --- getTimeout -----------------------------------------------------------
@@ -386,24 +390,24 @@ Blockly.Blocks['timeouts_setinterval'] = {
     },
     getVarModels: function () {
         const name = this.getFieldValue('NAME');
-        return [{getId: function () {return name;}, name: name, type: 'interval'}];
+        return [{ getId: () => { return name; }, name: name, type: 'interval' }];
     }
 };
 
 Blockly.JavaScript['timeouts_setinterval'] = function(block) {
+    const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
+    const unit = block.getFieldValue('UNIT');
+    
     let delay = block.getFieldValue('INTERVAL');
-    const name  = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
-    const unit  = block.getFieldValue('UNIT');
     if (unit === 'min') {
         delay *= 60000;
     } else if (unit === 'sec') {
         delay *= 1000;
     }
 
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
-
-    return name + ' = setInterval(async function () {\n' +
-        statements_name +
+    const statements = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    return name + ' = setInterval(async () => {\n' +
+        statements +
         '}, ' + delay + ');\n';
 };
 
@@ -454,17 +458,17 @@ Blockly.Blocks['timeouts_setinterval_variable'] = {
     },
     getVarModels: function () {
         const name = this.getFieldValue('NAME');
-        return [{getId: function () {return name;}, name: name, type: 'interval'}];
+        return [{ getId: () => { return name; }, name: name, type: 'interval' }];
     }
 };
 
 Blockly.JavaScript['timeouts_setinterval_variable'] = function(block) {
     const delay = Blockly.JavaScript.valueToCode(block, 'INTERVAL_MS', Blockly.JavaScript.ORDER_ATOMIC);
-    const name  = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
+    const statements = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return name + ' = setInterval(async function () {\n' +
-        statements_name +
+    return name + ' = setInterval(async () => {\n' +
+        statements +
         '}, parseInt(' + delay + '));\n';
 };
 
@@ -520,7 +524,7 @@ Blockly.Blocks['timeouts_clearinterval'] = {
 Blockly.JavaScript['timeouts_clearinterval'] = function(block) {
     const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
 
-    return '(function () { if (' + name + ') { clearInterval(' + name + '); ' + name + ' = null; }})();\n';
+    return '(() => { if (' + name + ') { clearInterval(' + name + '); ' + name + ' = null; }})();\n';
 };
 
 // --- getInterval -----------------------------------------------------------
@@ -549,5 +553,5 @@ Blockly.Blocks['timeouts_getinterval'] = {
 Blockly.JavaScript['timeouts_getinterval'] = function(block) {
     const name = Blockly.JavaScript.variableDB_.safeName_(block.getFieldValue('NAME'));
 
-    return [name, Blockly.JavaScript.ORDER_ATOMIC];;
+    return [name, Blockly.JavaScript.ORDER_ATOMIC];
 };

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

@@ -85,6 +85,7 @@ Blockly.Blocks['on_ext'] = {
     mutationToDom: function () {
         const container = document.createElement('mutation');
         container.setAttribute('items', this.itemCount_);
+
         return container;
     },
     /**
@@ -105,6 +106,7 @@ 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');
@@ -112,6 +114,7 @@ Blockly.Blocks['on_ext'] = {
             connection.connect(itemBlock.previousConnection);
             connection = itemBlock.nextConnection;
         }
+
         return containerBlock;
     },
     /**
@@ -128,6 +131,7 @@ 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++) {
             const connection = this.getInput('OID' + k).connection.targetConnection;
@@ -135,11 +139,13 @@ Blockly.Blocks['on_ext'] = {
                 connection.disconnect();
             }
         }
+
         this.itemCount_ = connections.length;
         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);
@@ -153,6 +159,7 @@ Blockly.Blocks['on_ext'] = {
     saveConnections: function(containerBlock) {
         let itemBlock = containerBlock.getInputTargetBlock('STACK');
         let i = 0;
+
         while (itemBlock) {
             const input = this.getInput('OID' + i);
             itemBlock.valueConnection_ = input && input.connection.targetConnection;
@@ -216,6 +223,7 @@ Blockly.Blocks['on_ext'] = {
                 }, 100, _input);
             }
         }
+
         // Remove deleted inputs.
         while (this.getInput('OID' + i)) {
             this.removeInput('OID' + i);
@@ -252,13 +260,14 @@ 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 = [];
@@ -274,12 +283,12 @@ Blockly.JavaScript['on_ext'] = function(block) {
             }
         }
     }
+
     const oid = '[].concat(' + oids.join(').concat(') + ')';
 
-    const code = 'on({ id: ' + oid + ', '  + val + (ack_condition ? ', ack: ' + ack_condition : '') + ' }, async (obj) => {\n' +
+    return `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' : '') +
-        statements_name + '});\n';
-    return code;
+        statement + '});\n';
 };
 
 // --- ON -----------------------------------------------------------
@@ -338,8 +347,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 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 : '';
+    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 : '';
 
     Blockly.Msg.VARIABLES_DEFAULT_NAME = 'value';
 
@@ -347,13 +356,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;\n', 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;', Blockly.JavaScript.INDENT) + '\n' +
         Blockly.JavaScript.prefixLines('let oldValue = obj.oldState.val;', Blockly.JavaScript.INDENT) + '\n' +
-        + statements_name +
+        statement +
         '});\n';
 };
 
@@ -397,7 +406,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);
@@ -440,11 +449,13 @@ 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];
 };
 
@@ -452,9 +463,6 @@ 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>'
@@ -481,15 +489,16 @@ Blockly.Blocks['schedule'] = {
 };
 Blockly.JavaScript['schedule'] = function(block) {
     let schedule = block.getFieldValue('SCHEDULE');
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
     if (schedule[0] === '{') {
         schedule = "'" + schedule + "'";
     } else {
         schedule = '"' + schedule + '"';
     }
-    return 'schedule(' + schedule + ', async () => {\n' +
-        statements_name +
+
+    return `schedule(${schedule}, async () => {\n` +
+        statement +
         '});\n';
 };
 
@@ -552,11 +561,11 @@ Blockly.Blocks['astro'] = {
 };
 Blockly.JavaScript['astro'] = function(block) {
     const astrotype = block.getFieldValue('TYPE');
-    const offset    = parseInt(block.getFieldValue('OFFSET'), 10);
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const offset = parseInt(block.getFieldValue('OFFSET'), 10);
+    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return 'schedule({ astro: "' + astrotype + '", shift: ' + offset + ' }, async () => {\n' +
-        statements_name +
+    return `schedule({ astro: '${astrotype}', shift: ${offset} }, async () => {\n` +
+        statement +
         '});\n';
 };
 
@@ -669,17 +678,17 @@ Blockly.Blocks['schedule_create'] = {
     },
     getVarModels: function () {
         const name = this.getFieldValue('NAME');
-        return [{getId: function () {return name;}, name: name, type: 'cron'}];
+        return [{ getId: () => { return name; }, name: name, type: 'cron' }];
     }
 };
 
 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 statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
     return name + ' = schedule(' + schedule + ', async () => {\n' +
-        statements_name +
+        statement +
         '});\n';
 };
 
@@ -734,7 +743,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 --------------------------------------------------
@@ -762,7 +771,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 --------------------------------------------------
@@ -801,6 +810,7 @@ Blockly.Blocks['cron_builder'] = {
             .appendField(Blockly.Translate('cron_builder_dow'));
 
         const wp = this.workspace;
+
         setTimeout(function (_input) {
             if (!_input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
@@ -810,9 +820,9 @@ Blockly.Blocks['cron_builder'] = {
             }
         }, 100, _input);
 
-
         _input = this.appendValueInput('MONTHS')
             .appendField(Blockly.Translate('cron_builder_month'));
+
         setTimeout(function (_input) {
             if (!_input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
@@ -824,6 +834,7 @@ Blockly.Blocks['cron_builder'] = {
 
         _input = this.appendValueInput('DAYS')
             .appendField(Blockly.Translate('cron_builder_day'));
+
         setTimeout(function (_input) {
             if (!_input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
@@ -835,6 +846,7 @@ Blockly.Blocks['cron_builder'] = {
 
         _input = this.appendValueInput('HOURS')
             .appendField(Blockly.Translate('cron_builder_hour'));
+
         setTimeout(function (_input) {
             if (!_input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
@@ -846,6 +858,7 @@ Blockly.Blocks['cron_builder'] = {
 
         _input = this.appendValueInput('MINUTES')
             .appendField(Blockly.Translate('cron_builder_minutes'));
+
         setTimeout(function (_input) {
             if (!_input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
@@ -878,6 +891,7 @@ Blockly.Blocks['cron_builder'] = {
         const container = document.createElement('mutation');
         container.setAttribute('seconds', this.seconds_);
         container.setAttribute('as_line', this.as_line_);
+
         return container;
     },
     /**
@@ -930,11 +944,12 @@ Blockly.JavaScript['cron_builder'] = function(block) {
     const code =
         (withSeconds === 'TRUE' || withSeconds === 'true' || withSeconds === true ?
             seconds + '.toString().trim() + \' \' + ' : '') +
-        minutes + '.toString().trim() + \' \' + ' +
-        hours   + '.toString().trim() + \' \' + ' +
-        days    + '.toString().trim() + \' \' + ' +
-        months  + '.toString().trim() + \' \' + ' +
-        dow     + '.toString().trim()';
+            minutes + '.toString().trim() + \' \' + ' +
+            hours   + '.toString().trim() + \' \' + ' +
+            days    + '.toString().trim() + \' \' + ' +
+            months  + '.toString().trim() + \' \' + ' +
+            dow     + '.toString().trim()';
+
     return [code, Blockly.JavaScript.ORDER_ATOMIC]
 };
 
@@ -972,10 +987,10 @@ Blockly.Blocks['onMessage'] = {
 
 Blockly.JavaScript['onMessage'] = function (block) {
     const message = block.getFieldValue('MESSAGE');
-    const statements_name = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return 'onMessage("' + message + '", async (data) => {\n' +
-        statements_name +
+    return `onMessage('${message}', async (data) => {\n` +
+        statement +
         '});\n';
 };
 
@@ -1023,16 +1038,18 @@ 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 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 : '';
+    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 : '';
 
-    return 'onFile(' + value_objectid + (objectname ? '/*' + objectname + '*/' : '') + ', ' +
-        file + ', ' + (withFile === 'TRUE' ? 'true' : 'false') +
-        ', async (id, fileName, size, data, mimeType) => {\n' + statements_name + '});\n';
+    return `onFile(${value_objectid}${objectName ? ` /* ${objectName} */` : ''}, ${file}, ${withFile === 'TRUE' ? 'true' : 'false'}, ` +
+        'async (id, fileName, size, data, mimeType) => {\n' +
+        statement +
+        '});\n';
 };
 
 // --- onFile -----------------------------------------------------------
@@ -1067,10 +1084,11 @@ 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

@@ -163,12 +163,12 @@ Blockly.Words['get_value_comment']                    = {'en': 'Value comment',
 Blockly.Words['get_value_from']                       = {'en': 'Source',                                          'de': 'Quelle',                                          'ru': 'Происхождение',                                   'pt': 'Fonte',                                           'nl': 'Bron',                                            'fr': 'La source',                                       'it': 'fonte',                                           'es': 'Fuente',                                          'pl': 'Source',                                          'zh-cn': '上次变更发起者',                                         'uk': 'Джерело'};
 Blockly.Words['get_common_name']                      = {'en': 'Object name',                                     'de': 'Objektname',                                      'ru': 'Имя объекта',                                     'pt': 'Nome do objeto',                                  'nl': 'Object naam',                                     'fr': 'Nom de l\'objet',                                 'it': 'Nome oggetto',                                    'es': 'Nombre del objeto',                               'pl': 'Nazwa obiektu',                                   'zh-cn': '对象名称',                                            'uk': 'Назва об\'єкта'};
 Blockly.Words['get_common_desc']                      = {'en': 'Object description',                              'de': 'Objektbeschreibung',                              'ru': 'Описание объекта',                                'pt': 'Descrição do objeto',                             'nl': 'Objectbeschrijving',                              'fr': 'Descriptif de l\'objet',                          'it': 'Descrizione dell\'oggetto',                       'es': 'Descripción del objeto',                          'pl': 'Opis obiektu',                                    'zh-cn': '对象描述',                                            'uk': 'Опис об\'єкта'};
-Blockly.Words['get_common_unit']                      = {'en': 'State unit',                                      'de': 'Zustands-Einheit',                                 'ru': 'Единица измерения',                         'pt': 'unidade estadual',                                'nl': 'Staatseenheid',                                   'fr': 'Unité d\'état',                                   'it': 'Unità statale',                                   'es': 'unidad estatal',                                  'pl': 'Jednostka państwowa',                             'zh-cn': '国家单位',                                            'uk': 'Державна одиниця'};
+Blockly.Words['get_common_unit']                      = {'en': 'State unit',                                      'de': 'Zustands-Einheit',                                'ru': 'Единица измерения',                               'pt': 'unidade estadual',                                'nl': 'Staatseenheid',                                   'fr': 'Unité d\'état',                                   'it': 'Unità statale',                                   'es': 'unidad estatal',                                  'pl': 'Jednostka państwowa',                             'zh-cn': '国家单位',                                            'uk': 'Державна одиниця'};
 Blockly.Words['get_common_role']                      = {'en': 'Object role',                                     'de': 'Objektrolle',                                     'ru': 'Роль объекта',                                    'pt': 'função do objeto',                                'nl': 'Object rol',                                      'fr': 'Rôle d\'objet',                                   'it': 'Ruolo dell\'oggetto',                             'es': 'Rol de objeto',                                   'pl': 'Rola obiektu',                                    'zh-cn': '对象角色',                                            'uk': 'Об\'єктна роль'};
 Blockly.Words['get_common_state_type']                = {'en': 'State type',                                      'de': 'Zustandstyp',                                     'ru': 'Тип состояния',                                   'pt': 'tipo de estado',                                  'nl': 'Type staat',                                      'fr': 'Type d\'état',                                    'it': 'Tipo di stato',                                   'es': 'tipo de estado',                                  'pl': 'Typ stanu',                                       'zh-cn': '状态类型',                                            'uk': 'Державний тип'};
 Blockly.Words['get_common_object_type']               = {'en': 'Object type',                                     'de': 'Objekttyp',                                       'ru': 'Тип объекта',                                     'pt': 'Tipo de objeto',                                  'nl': 'Object type',                                     'fr': 'Type d\'objet',                                   'it': 'Tipo di oggetto',                                 'es': 'Tipo de objeto',                                  'pl': 'Rodzaj obiektu',                                  'zh-cn': '对象类型',                                            'uk': 'Тип об\'єкта'};
-Blockly.Words['get_common_read']                      = {'en': 'Is state readable',                               'de': 'Zustand lesbar ist',                              'ru': 'Является читаемым',                  'pt': 'O estado é legível',                              'nl': 'Staat leesbaar',                                  'fr': 'L\'état est-il lisible',                          'it': 'È leggibile dallo stato',                         'es': 'Es estado legible',                               'pl': 'Czy stan jest czytelny',                          'zh-cn': '状态是否可读',                                          'uk': 'Чи читається стан'};
-Blockly.Words['get_common_write']                     = {'en': 'Is state writable',                               'de': 'Zustand beschreibbar ist',                        'ru': 'Доступно для записи',                   'pt': 'É estado gravável',                               'nl': 'Staat beschrijfbaar',                             'fr': 'L\'état est-il accessible en écriture',           'it': 'È stato scrivibile',                              'es': 'Es el estado escribible',                         'pl': 'Czy stan jest zapisywalny',                       'zh-cn': '状态是否可写',                                          'uk': 'Доступний для запису в стані'};
+Blockly.Words['get_common_read']                      = {'en': 'Is state readable',                               'de': 'Zustand lesbar ist',                              'ru': 'Является читаемым',                               'pt': 'O estado é legível',                              'nl': 'Staat leesbaar',                                  'fr': 'L\'état est-il lisible',                          'it': 'È leggibile dallo stato',                         'es': 'Es estado legible',                               'pl': 'Czy stan jest czytelny',                          'zh-cn': '状态是否可读',                                          'uk': 'Чи читається стан'};
+Blockly.Words['get_common_write']                     = {'en': 'Is state writable',                               'de': 'Zustand beschreibbar ist',                        'ru': 'Доступно для записи',                             'pt': 'É estado gravável',                               'nl': 'Staat beschrijfbaar',                             'fr': 'L\'état est-il accessible en écriture',           'it': 'È stato scrivibile',                              'es': 'Es el estado escribible',                         'pl': 'Czy stan jest zapisywalny',                       'zh-cn': '状态是否可写',                                          'uk': 'Доступний для запису в стані'};
 Blockly.Words['get_value_async']                      = {'en': 'Get state value',                                 'de': 'Zustandswert nehmen',                             'ru': 'Взять значение состояния',                        'pt': 'Tome o valor do estado',                          'nl': 'Krijg statuswaarde',                              'fr': 'Obtenir la valeur de l\'état',                    'it': 'Ottieni valore statale',                          'es': 'Obtener valor de estado',                         'pl': 'Get state value',                                 'zh-cn': '获取状态的值',                                          'uk': 'Отримати державне значення'};
 
 // --- system field --------------------------------------------------
@@ -412,9 +412,9 @@ Blockly.Words['logic_switch_case']                    = {'en': 'Switch / case',
 Blockly.Words['logic_switch_case_is']                 = {'en': 'the case is',                                     'de': 'der Fall ist',                                    'ru': 'условие',                                         'pt': 'o caso é',                                        'nl': 'het geval is',                                    'fr': 'le cas est',                                      'it': 'il caso è',                                       'es': 'el caso es',                                      'pl': 'sprawa jest',                                     'zh-cn': '情况是',                                             'uk': 'справа є'};
 Blockly.Words['logic_switch_case_of']                 = {'en': 'in case of',                                      'de': 'im Falle von',                                    'ru': 'в случае',                                        'pt': 'no caso de',                                      'nl': 'in het geval van',                                'fr': 'en cas de',                                       'it': 'in caso di',                                      'es': 'en caso de',                                      'pl': 'w przypadku',                                     'zh-cn': '的情况下',                                            'uk': 'в випадку'};
 Blockly.Words['logic_switch_do']                      = {'en': 'do',                                              'de': 'machen',                                          'ru': 'выполнить',                                       'pt': 'Faz',                                             'nl': 'Doen',                                            'fr': 'faire',                                           'it': 'fare',                                            'es': 'hacer',                                           'pl': 'zrobić',                                          'zh-cn': '做',                                               'uk': 'робити'};
-Blockly.Words['logic_switch_tootltip']                = {'en': 'Does something if the condition is true. If there isn\'t a matching case the default function will be executed.', 'de': 'Tut etwas, wenn die Bedingung erfüllt ist. Wenn es keinen passenden Fall gibt, wird die Standardfunktion ausgeführt.', 'ru': 'Делает что-то, если условие выполняется. Если совпадения не найдено, будет выполнена функция по умолчанию.', 'pt': 'Faz alguma coisa se a condição for verdadeira. Se não houver um caso correspondente, a função padrão será executada.', 'nl': 'Doet iets als de voorwaarde waar is. Als er geen overeenkomende case is, wordt de standaardfunctie uitgevoerd.', 'fr': 'Fait quelque chose si la condition est vraie. S\'il n\'y a pas de cas correspondant, la fonction par défaut sera exécutée.', 'it': 'Fa qualcosa se la condizione è vera. Se non esiste un caso corrispondente, verrà eseguita la funzione predefinita.', 'es': 'Hace algo si la condición es verdadera. Si no hay un caso coincidente, se ejecutará la función predeterminada.', 'pl': 'Robi coś, jeśli warunek jest spełniony. Jeśli nie ma pasującego przypadku, zostanie wykonana funkcja domyślna.', 'zh-cn': '如果条件为真，则执行某些操作。如果没有匹配的情况，将执行默认功能。',               'uk': 'Робить щось, якщо умова істинна. Якщо відповідного регістру немає, буде виконано функцію за замовчуванням.'};
-Blockly.Words['logic_switch_default_tootltip']        = {'en': 'This function will run if there aren\'t any matching cases.', 'de': 'Diese Funktion wird ausgeführt, wenn keine übereinstimmenden Fälle vorliegen.', 'ru': 'Эта функция будет запущена, если нет соответствующих случаев.', 'pt': 'Esta função será executada se não houver casos correspondentes.', 'nl': 'Deze functie wordt uitgevoerd als er geen overeenkomende gevallen zijn.', 'fr': 'Cette fonction s\'exécutera s\'il n\'y a pas de cas correspondants.', 'it': 'Questa funzione verrà eseguita se non ci sono casi corrispondenti.', 'es': 'Esta función se ejecutará si no hay casos coincidentes.', 'pl': 'Ta funkcja będzie działać, jeśli nie ma pasujących przypadków.', 'zh-cn': '如果没有匹配的情况，此功能将运行。',                               'uk': 'Ця функція запуститься, якщо немає відповідних регістрів.'};
-Blockly.Words['logic_switch_control_case_tootltip']   = {'en': 'This is a variable for condition.',               'de': 'Dies ist eine Variable für die Bedingung.',       'ru': 'Это переменная для условия.',                     'pt': 'Esta é uma variável para a condição.',            'nl': 'Dit is een variabele voor conditie.',             'fr': 'Il s\'agit d\'une variable de condition.',        'it': 'Questa è una variabile per condizione.',          'es': 'Esta es una variable para la condición.',         'pl': 'Jest to zmienna warunku.',                        'zh-cn': '这是用于条件的变量。',                                      'uk': 'Це змінна умови.'};
+Blockly.Words['logic_switch_tooltip']                = {'en': 'Does something if the condition is true. If there isn\'t a matching case the default function will be executed.', 'de': 'Tut etwas, wenn die Bedingung erfüllt ist. Wenn es keinen passenden Fall gibt, wird die Standardfunktion ausgeführt.', 'ru': 'Делает что-то, если условие выполняется. Если совпадения не найдено, будет выполнена функция по умолчанию.', 'pt': 'Faz alguma coisa se a condição for verdadeira. Se não houver um caso correspondente, a função padrão será executada.', 'nl': 'Doet iets als de voorwaarde waar is. Als er geen overeenkomende case is, wordt de standaardfunctie uitgevoerd.', 'fr': 'Fait quelque chose si la condition est vraie. S\'il n\'y a pas de cas correspondant, la fonction par défaut sera exécutée.', 'it': 'Fa qualcosa se la condizione è vera. Se non esiste un caso corrispondente, verrà eseguita la funzione predefinita.', 'es': 'Hace algo si la condición es verdadera. Si no hay un caso coincidente, se ejecutará la función predeterminada.', 'pl': 'Robi coś, jeśli warunek jest spełniony. Jeśli nie ma pasującego przypadku, zostanie wykonana funkcja domyślna.', 'zh-cn': '如果条件为真，则执行某些操作。如果没有匹配的情况，将执行默认功能。',               'uk': 'Робить щось, якщо умова істинна. Якщо відповідного регістру немає, буде виконано функцію за замовчуванням.'};
+Blockly.Words['logic_switch_default_tooltip']        = {'en': 'This function will run if there aren\'t any matching cases.', 'de': 'Diese Funktion wird ausgeführt, wenn keine übereinstimmenden Fälle vorliegen.', 'ru': 'Эта функция будет запущена, если нет соответствующих случаев.', 'pt': 'Esta função será executada se não houver casos correspondentes.', 'nl': 'Deze functie wordt uitgevoerd als er geen overeenkomende gevallen zijn.', 'fr': 'Cette fonction s\'exécutera s\'il n\'y a pas de cas correspondants.', 'it': 'Questa funzione verrà eseguita se non ci sono casi corrispondenti.', 'es': 'Esta función se ejecutará si no hay casos coincidentes.', 'pl': 'Ta funkcja będzie działać, jeśli nie ma pasujących przypadków.', 'zh-cn': '如果没有匹配的情况，此功能将运行。',                               'uk': 'Ця функція запуститься, якщо немає відповідних регістрів.'};
+Blockly.Words['logic_switch_control_case_tooltip']   = {'en': 'This is a variable for condition.',               'de': 'Dies ist eine Variable für die Bedingung.',       'ru': 'Это переменная для условия.',                     'pt': 'Esta é uma variável para a condição.',            'nl': 'Dit is een variabele voor conditie.',             'fr': 'Il s\'agit d\'une variable de condition.',        'it': 'Questa è una variabile per condizione.',          'es': 'Esta es una variable para la condición.',         'pl': 'Jest to zmienna warunku.',                        'zh-cn': '这是用于条件的变量。',                                      'uk': 'Це змінна умови.'};
 
 // --- trigger onFile --------------------------------------------------
 Blockly.Words['onFile']                               = {'en': 'Event: file update',                              'de': 'Ereignis: Datei geändert',                        'ru': 'Событие: файл обновлён',                          'pt': 'Evento: se arquivo',                              'nl': 'Gebeurtenis: als bestand',                        'fr': 'Evénement : si fichier',                          'it': 'Evento: se file',                                 'es': 'Evento: si el archivo',                           'pl': 'Zdarzenie: jeśli plik',                           'zh-cn': '事件：如果文件',                                         'uk': 'Подія: оновлення файлу'};
@@ -444,16 +444,21 @@ 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'};
 
-// --- 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 --------------------------------------------------
 
-// --- 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" };
+// --- logic between --------------------------------------------------
+Blockly.Words['logic_between_min']                    = {'en': 'Min',                                             'de': 'Min',                                             'ru': 'Мин',                                             'pt': 'Min',                                             'nl': 'Min',                                             'fr': 'Min',                                             'it': 'Min',                                             'es': 'Min',                                             'pl': 'Min',                                             'zh-cn': '明 明',                                             'uk': 'Мінуси'};
+Blockly.Words['logic_between_max']                    = {'en': 'Max',                                             'de': 'Max',                                             'ru': 'Макс',                                            'pt': 'Max',                                             'nl': 'Max',                                             'fr': 'Max',                                             'it': 'Max',                                             'es': 'Max',                                             'pl': 'Max',                                             'zh-cn': 'Max',                                             'uk': 'Макс'};
+Blockly.Words['logic_between_tooltip']                = {'en': 'if a number between min and max',                 'de': 'wenn eine Zahl zwischen min und max',             'ru': 'если число между min и max',                      'pt': 'se um número entre min e max',                    'nl': 'als een getal tussen min en max',                 'fr': 'si un nombre entre min et max',                   'it': 'se un numero compreso tra min e max',             'es': 'si un número entre min y max',                    'pl': 'jeśli liczba między min a max',                   'zh-cn': '如果最小值和最大值之间的数字',                                  'uk': 'якщо число між min і max'};
 
-// --- 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": "然后" };
+// --- 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',                            'zh-cn': '空',                                               'uk': 'якщо порожній'};
+Blockly.Words['logic_ifempty_then']                   = {'en': 'then',                                            'de': 'dann',                                            'ru': 'затем',                                           'pt': 'então',                                           'nl': 'dan',                                             'fr': 'puis',                                            'it': 'allora',                                          'es': 'entonces',                                        'pl': 'potem',                                           'zh-cn': '然后',                                              'uk': 'потім'};
+Blockly.Words['logic_ifempty_tooltip']                = {'en': 'check if empty',                                  'de': 'Überprüfen, ob es leer ist',                      'ru': 'проверить, если пусто',                           'pt': 'verifique se está vazio',                         'nl': 'controleer of leeg',                              'fr': 'vérifier si vide',                                'it': 'controlla se vuoto',                              'es': 'comprobar si está vacío',                         'pl': 'sprawdź, czy jest pusty',                         'zh-cn': '检查是否为空',                                          'uk': 'перевірити, чи порожній'};
+
+function getHelp(word) {
+    return 'https://github.com/ioBroker/ioBroker.javascript/blob/master/docs/en/javascript.md#' + Blockly.Words[word][systemLang];
+}
 
 Blockly.Translate = function (word, lang) {
     lang = lang || systemLang;
@@ -466,4 +471,4 @@ Blockly.Translate = function (word, lang) {
 
 if (typeof module !== 'undefined' && typeof module.parent !== 'undefined') {
     module.exports = Blockly;
-}
+}