iobroker.javascript 7.0.7 → 7.0.8

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

@@ -2,9 +2,20 @@
 // I really tried to get the license conditions from authors, but no luck :(
 // Many thanks to Florian Pechwitz <florian.Pechwitz@itizzimo.com> for the code
 
+Blockly.System.blocks['logic_switch_case'] =
+    '<block type="logic_switch_case">'
+    + '     <value name="CONDITION">'
+    + '     </value>'
+    + '     <value name="CASECONDITION0">'
+    + '     </value>'
+    + '     <value name="CASE0">'
+    + '     </value>'
+    + '     <mutation with_statement="false" items="parameter1"></mutation>'
+    + '</block>';
+
 Blockly.Blocks['logic_switch_case'] = {
     init: function() {
-        this.setColour("%{BKY_LOGIC_HUE}");
+        this.setColour(Blockly.Constants.Logic.HUE);
         this.setPreviousStatement(true);
         this.setNextStatement(true);
         this.appendValueInput('CONDITION')
@@ -24,7 +35,7 @@ Blockly.Blocks['logic_switch_case'] = {
             return null;
         }
 
-        var container = document.createElement('mutation');
+        const container = document.createElement('mutation');
 
         if (this.caseCount_) {
             container.setAttribute('case', this.caseCount_);
@@ -40,7 +51,7 @@ Blockly.Blocks['logic_switch_case'] = {
         this.caseCount_    = parseInt(xmlElement.getAttribute('case'), 10);
         this.defaultCount_ = parseInt(xmlElement.getAttribute('default'), 10);
 
-        for (var x = 1; x <= this.caseCount_; x++) {
+        for (let x = 1; x <= this.caseCount_; x++) {
             this.appendValueInput('CASECONDITION' + x)
                 .appendField(Blockly.Translate('logic_switch_case_of'));
             this.appendStatementInput('CASE' + x)
@@ -54,20 +65,20 @@ Blockly.Blocks['logic_switch_case'] = {
     },
 
     decompose: function(workspace) {
-        var containerBlock = workspace.newBlock('control_case');//Blockly.Block.obtain(workspace, 'control_case');
+        const containerBlock = workspace.newBlock('control_case');//Blockly.Block.obtain(workspace, 'control_case');
         containerBlock.initSvg();
 
-        var connection = containerBlock.getInput('STACK').connection;
+        let connection = containerBlock.getInput('STACK').connection;
 
-        for (var x = 1; x <= this.caseCount_; x++) {
-            var caseBlock = workspace.newBlock('case_incaseof');//Blockly.Block.obtain(workspace, 'case_incaseof');
+        for (let x = 1; x <= this.caseCount_; x++) {
+            const caseBlock = workspace.newBlock('case_incaseof');//Blockly.Block.obtain(workspace, 'case_incaseof');
             caseBlock.initSvg();
             connection.connect(caseBlock.previousConnection);
             connection = caseBlock.nextConnection;
         }
 
         if (this.defaultCount_) {
-            var defaultBlock = workspace.newBlock('case_default');//Blockly.Block.obtain(workspace, 'case_default');
+            const defaultBlock = workspace.newBlock('case_default');//Blockly.Block.obtain(workspace, 'case_default');
             defaultBlock.initSvg();
             connection.connect(defaultBlock.previousConnection);
         }
@@ -83,23 +94,23 @@ Blockly.Blocks['logic_switch_case'] = {
 
         this.defaultCount_ = 0;
 
-        for (var x = this.caseCount_; x > 0; x--) {
+        for (let x = this.caseCount_; x > 0; x--) {
             this.removeInput('CASECONDITION' + x);
             this.removeInput('CASE' + x);
         }
 
         this.caseCount_ = 0;
 
-        var caseBlock = containerBlock.getInputTargetBlock('STACK');
+        let caseBlock = containerBlock.getInputTargetBlock('STACK');
 
         while (caseBlock) {
             switch(caseBlock.type) {
                 case 'case_incaseof':
                     this.caseCount_++;
-                    var caseconditionInput = this.appendValueInput('CASECONDITION' + this.caseCount_)
+                    const caseconditionInput = this.appendValueInput('CASECONDITION' + this.caseCount_)
                         .appendField(Blockly.Translate('logic_switch_case_of'));
 
-                    var caseInput = this.appendStatementInput('CASE' + this.caseCount_)
+                    const caseInput = this.appendStatementInput('CASE' + this.caseCount_)
                         .appendField(Blockly.Translate('logic_switch_do'));
 
                     if (caseBlock.valueConnection_) {
@@ -113,7 +124,7 @@ Blockly.Blocks['logic_switch_case'] = {
 
                 case 'case_default':
                     this.defaultCount_++;
-                    var defaultInput = this.appendStatementInput('ONDEFAULT')
+                    const defaultInput = this.appendStatementInput('ONDEFAULT')
                         .appendField('default');
 
                     if (caseBlock.statementConnection_) {
@@ -130,19 +141,19 @@ Blockly.Blocks['logic_switch_case'] = {
     },
 
     saveConnections: function(containerBlock) {
-        var caseBlock = containerBlock.getInputTargetBlock('STACK');
-        var x = 1;
+        let caseBlock = containerBlock.getInputTargetBlock('STACK');
+        let x = 1;
         while (caseBlock) {
             switch (caseBlock.type) {
                 case'case_incaseof':
-                    var caseconditionInput = this.getInput('CASECONDITION' + x);
-                    var caseInput = this.getInput('CASE' + x);
+                    const caseconditionInput = this.getInput('CASECONDITION' + x);
+                    const caseInput = this.getInput('CASE' + x);
                     caseBlock.valueConnection_ = caseconditionInput && caseconditionInput.connection.targetConnection;
                     caseBlock.statementConnection_ = caseInput && caseInput.connection.targetConnection;
                     x++;
                     break;
                 case'case_default':
-                    var defaultInput = this.getInput('ONDEFAULT');
+                    const defaultInput = this.getInput('ONDEFAULT');
                     caseBlock.satementConnection_ = defaultInput && defaultInput.connection.targetConnection;
                     break;
                 default:
@@ -156,7 +167,7 @@ Blockly.Blocks['logic_switch_case'] = {
 
 Blockly.Blocks['control_case'] = {
     init: function() {
-        this.setColour("%{BKY_LOGIC_HUE}");
+        this.setColour(180);
         this.appendDummyInput()
             .appendField(Blockly.Translate('logic_switch_case_is'));
         this.appendStatementInput('STACK');
@@ -167,7 +178,7 @@ Blockly.Blocks['control_case'] = {
 
 Blockly.Blocks['case_incaseof'] = {
     init: function() {
-        this.setColour("%{BKY_LOGIC_HUE}");
+        this.setColour(180);
         this.appendDummyInput()
             .appendField(Blockly.Translate('logic_switch_case_of'));
         this.setPreviousStatement(true);
@@ -179,7 +190,7 @@ Blockly.Blocks['case_incaseof'] = {
 
 Blockly.Blocks['case_default'] = {
     init: function() {
-        this.setColour("%{BKY_LOGIC_HUE}");
+        this.setColour(180);
         this.appendDummyInput()
             .appendField('default');
         this.setPreviousStatement(true);
@@ -190,21 +201,21 @@ Blockly.Blocks['case_default'] = {
 };
 
 Blockly.JavaScript['logic_switch_case'] = function (block) {
-    var code = '';
-    var do_n;
-    var case_n;
-    var switchVariable = Blockly.JavaScript.valueToCode(block, 'CONDITION', Blockly.JavaScript.ORDER_NONE) || null;
+    let code = '';
+    let do_n;
+    let case_n;
+    const switchVariable = Blockly.JavaScript.valueToCode(block, 'CONDITION', Blockly.JavaScript.ORDER_NONE) || null;
 
     if (switchVariable){
-        var pattern = /^\(?([._$\d\w"?: \(\)])*\)?$/g;
+        const pattern = /^\(?([._$\d\w"?: \(\)])*\)?$/g;
 
         if (pattern.test(switchVariable)) { // Check to see if the switch is a kind of variable type
             code = '\nswitch (' + switchVariable + ') {\n';
-            var case_0 = Blockly.JavaScript.valueToCode(block, 'CASECONDITION0', Blockly.JavaScript.ORDER_NONE) || null;
-            var do_0 = Blockly.JavaScript.statementToCode(block, 'CASE0');
+            const case_0 = Blockly.JavaScript.valueToCode(block, 'CASECONDITION0', Blockly.JavaScript.ORDER_NONE) || null;
+            const do_0 = Blockly.JavaScript.statementToCode(block, 'CASE0');
             code += '\tcase ' + case_0 + ':\n' + do_0 + '\n\t\tbreak;\n';
 
-            for (var n = 1; n <= block.caseCount_; n++) {
+            for (let n = 1; n <= block.caseCount_; n++) {
                 case_n = Blockly.JavaScript.valueToCode(block, 'CASECONDITION' + n,
                     Blockly.JavaScript.ORDER_NONE) || null;