gobstones-blockly 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93b2dbc1357ab9893fa94a10c8416ab43e739df58f2caf7105db16f66fae746
-  data.tar.gz: a4e3a8dee90769647c4e0b2a6c0a0628e09ea516a646e53a635ece679572ed67
+  metadata.gz: 891585669cd266e97df6ffd8181937289f509807199bb7e934ff66912d0736fb
+  data.tar.gz: 8d8d8930bf62bec7c4fff979550e434899fe5384c5e10474676e230554c6dc76
 SHA512:
-  metadata.gz: fc00dd7bd613135e8f7c6dd47d9e9b92eb5e8cb9b51109f2997d3ff79469097df32359f75ccb140036f5709ab96893728a8385251a867f4c6d4520055eeb5ffe
-  data.tar.gz: 9428475425df8dcae170389a2ac3a7ce380ef3056c5e42ce6e0063933e328a9e9aa5f305d5b64c6d0eb49a59d809acfc96265745c4527f20c256f0c96da10f3f
+  metadata.gz: fd46da04329bf1b411e4019abcaf8f9d08b0d2a2ffdb73566b5148d03092d869219534b9abbda36cd377f447bd2cfcce2c0f8118a47d74cd9b415421850915b5
+  data.tar.gz: ec38226415b998814c5efa693285391078d1206d02a0a82d02fefda81eea45738dd8181a4340cdf54d9bde6e43e0dd8b8397dc3ab1458b7f56ae9a25f07673db

data/app/assets/htmls/gs-element-blockly.html

@@ -3573,7 +3573,11 @@ window.initProcedsBlockly = function(customStatementType) {
         this.setCommentText(comment);
       }
       this.setCommentText(null);
-      this.setColour(Blockly.Blocks.procedures.HUE);
+      this.setColour((
+        Blockly.CUSTOM_COLORS && (
+          Blockly.CUSTOM_COLORS[this.type] ||
+          Blockly.CUSTOM_COLORS[withReturn ? "function" : "procedure"]
+        )) || Blockly.Blocks.procedures.HUE);
       this.setTooltip(tooltip);
       this.setHelpUrl(helpUrl);
       this.arguments_ = [];
@@ -3581,6 +3585,26 @@ window.initProcedsBlockly = function(customStatementType) {
       this.statementConnection_ = null;
 
       // if (!withParametersMutator) this.updateParams_();
+
+      // [!] adding create call button
+      // TODO: Hacer esto
+      // var xmlMutation = goog.dom.createDom('mutation');
+      // xmlMutation.setAttribute('name', name);
+      // for (var i = 0; i < self.arguments_.length; i++) {
+      //   var xmlArg = goog.dom.createDom('arg');
+      //   xmlArg.setAttribute('name', self.arguments_[i]);
+      //   xmlMutation.appendChild(xmlArg);
+      // }
+      // var xmlBlock = goog.dom.createDom('block', null, xmlMutation);
+      // xmlBlock.setAttribute('type', self.callType_);
+      // var createCallButton = new Blockly.FieldImage(
+      //   WAND,
+      //   16,
+      //   16,
+      //   "",
+      //   Blockly.ContextMenu.callbackFactory(self, xmlBlock)
+      // );
+      // input.appendField(createCallButton);
     };
   };
 
@@ -3648,13 +3672,14 @@ window.initProcedsBlockly = function(customStatementType) {
     };
   };
 
-  // ----------------------------------------------------
-  // [!] Setting custom statement type to procedure calls
-  // ----------------------------------------------------
+  // ---------------------------------------------------------------------
+  // [!] Setting custom statement type to procedure calls and adding color
+  // ---------------------------------------------------------------------
 
   var oldProceduresCallNoReturnInit = Blockly.Blocks['procedures_callnoreturn'].init;
   Blockly.Blocks['procedures_callnoreturn'].init = function() {
     oldProceduresCallNoReturnInit.call(this);
+
     if (customStatementType) {
       this.jsonInit({
         type: customStatementType,
@@ -3662,6 +3687,27 @@ window.initProcedsBlockly = function(customStatementType) {
         nextStatement: customStatementType
       });
     }
+
+    this.setColour((
+      Blockly.CUSTOM_COLORS && (
+        Blockly.CUSTOM_COLORS[this.type] ||
+        Blockly.CUSTOM_COLORS.procedure_call
+      )) || Blockly.Blocks.procedures.HUE);
+  };
+
+  // ----------------------------------
+  // [!] Adding color to function calls
+  // ----------------------------------
+
+  var oldProceduresCallReturnInit = Blockly.Blocks['procedures_callreturn'].init;
+  Blockly.Blocks['procedures_callreturn'].init = function() {
+    oldProceduresCallReturnInit.call(this);
+
+    this.setColour((
+      Blockly.CUSTOM_COLORS && (
+        Blockly.CUSTOM_COLORS[this.type] || // TODO: Usar this.type en todos los cosos de colors
+        Blockly.CUSTOM_COLORS.function_call
+      )) || Blockly.Blocks.procedures.HUE);
   };
 
   // -------------------------------
@@ -3985,10 +4031,11 @@ window.initProcedsBlockly = function(customStatementType) {
 </script>
   <script>initProcedsBlockly("Statement");</script>
   <script>var MINUS = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAQAAAD2e2DtAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAHdElNRQfhDAUCCi+xWH4JAAABcUlEQVR42u3c7ZGCMBSG0etuYcTKls7AyrSEVWd4+bjnUECMeSbhD6kCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBzu4XHm2rUvPekD2yutR57/4itTLXU0/Pvs9SUW5TcDrDUyE3r9Na6ZwZKBWD5PxVKIBPAVGtknGsZibeBTADPyCjXE1idn8A0/gJjXFPgn0sEwIEljgAHwPc2Xx87QHMCaE4AzQmgOQE0J4DmBNCcAJoTQHMCaE4AzQmgOQE0J4DmBNCcAJoTQHMCaE4AzQmgOQE0J4DmBNDcb2SUsfc0T2re/utAO0BzPg49sot8HOoI+M5IDJIJ4OF+gI+F7gpyRcwxxa6Iyb0E3mvYB96y1kgtv2vijubS18QBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAWXq7xrTQhKAi3AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEyLTA1VDAyOjEwOjQ3LTA1OjAwdZLI/gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMi0wNVQwMjoxMDo0Ny0wNTowMATPcEIAAAAASUVORK5CYII=";
+var HAND = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfiBAUBKBeKSgeBAAABTElEQVQoz22QzyvDcRjHX5/vvrMyStI2uZgftdVCSpJCyW1y00oUF+Xg4OIkx5VyUyJOsgv/gnJw4YCSSFMyB5pGbLJ99/k8LltreB2f9+v50eOigoc5FvGTJF8pugCwaKaNaE98uf9zMBXwjtNpbvmuaH2B0+HXuuyMEbOlQ4U1M5ZVcYbowg02YfZW5cnE9JIROdI7jsiOacoMPLZdEYPR1ouQkxCRG+feESlIXkQOzLR+NhvCpc3UbPcHAoRsADcAQ0Twq0ZosQgEVY0SqvGpkAUCxkIUYRP4bZRRNi9pvaD+TwXyFseHuYzy/Kt8CWfQ5Ems6C/5y7uZyDEH0Nt8vq0dUx0XzaapPyIIoIi23+47+SrlTvrTjLhKy2wmO95OqiacS+QBH9gAFDlOZnYbrimWOixSZCwUlK+vZd7bXiPldyi0yqX1OtkfCBS/9XAtDKAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDQtMDVUMDQ6NDQ6NDItMDM6MDD+uUN1AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA0LTA1VDA0OjQwOjIzLTAzOjAw5hdZgAAAAABJRU5ErkJggg==";
 
 /* global Blockly */
 
-Blockly.GOBSTONES_COLORS = {
+Blockly.CUSTOM_COLORS = {
 	globalHsvSaturation: Blockly.HSV_SATURATION,
 	globalHsvValue: Blockly.HSV_VALUE,
 	primitiveCommand: "#8DA65B",
@@ -4000,6 +4047,13 @@ Blockly.GOBSTONES_COLORS = {
 	interactiveProgram: "#A6805B",
 	interactiveBinding: "#A6995B",
 	procedure: "#995BA6",
+	function: "#774A77",
+	primitiveProcedure: "#CACACA",
+	primitiveFunction: "#BABABA",
+	procedure_call: "#661CF6",
+	function_call: "#330610",
+	variable: "#FF0000",
+	parameter: "#0000FF",
 	complete: "#A65C5B",
 };
 
@@ -4036,7 +4090,7 @@ Blockly.Blocks.Program = {
 				}
 			]
 		})
-		this.setColour(Blockly.GOBSTONES_COLORS.program);
+		this.setColour(Blockly.CUSTOM_COLORS.Program || Blockly.CUSTOM_COLORS.program);
 		this.setDeletable(true);
 		this.setEditable(true);
 		this.setMovable(true);
@@ -4080,7 +4134,7 @@ Blockly.Blocks.InteractiveProgram = {
 				}
 			]
 		});
-		this.setColour(Blockly.GOBSTONES_COLORS.interactiveProgram);
+		this.setColour(Blockly.CUSTOM_COLORS.InteractiveProgram || Blockly.CUSTOM_COLORS.interactiveProgram);
 		this.setDeletable(true);
 		this.setEditable(true);
 		this.setMovable(true);
@@ -4222,7 +4276,7 @@ createInteractiveBinding = (name, keys) => {
 						options: keys.map(it => [it.name, it.code]),
 					}
 				],
-				colour: Blockly.GOBSTONES_COLORS.interactiveBinding,
+				colour: Blockly.CUSTOM_COLORS.InteractiveBinding || Blockly.CUSTOM_COLORS.interactiveBinding,
 				tooltip: "Escoger una entrada",
 			});
 
@@ -4323,7 +4377,7 @@ Blockly.Blocks.RepeticionSimple = {
 			nextStatement: "Statement",
 		});
 
-		this.setColour(Blockly.GOBSTONES_COLORS.controlStructure);
+		this.setColour(Blockly.CUSTOM_COLORS.RepeticionSimple || Blockly.CUSTOM_COLORS.controlStructure);
 		this.appendValueInput('count')
 			.appendField('repetir');
 		this.appendDummyInput()
@@ -4341,7 +4395,7 @@ Blockly.Blocks.RepeticionCondicional = {
 			nextStatement: "Statement",
 		});
 
-		this.setColour(Blockly.GOBSTONES_COLORS.controlStructure);
+		this.setColour(Blockly.CUSTOM_COLORS.RepeticionCondicional || Blockly.CUSTOM_COLORS.controlStructure);
 		this.appendValueInput('condicion')
 			.setCheck('Bool')
 			.appendField('repetir hasta que');
@@ -4358,7 +4412,7 @@ Blockly.Blocks.AlternativaSimple = {
 			nextStatement: "Statement",
 		});
 
-		this.setColour(Blockly.GOBSTONES_COLORS.controlStructure);
+		this.setColour(Blockly.CUSTOM_COLORS.AlternativaSimple || Blockly.CUSTOM_COLORS.controlStructure);
 		this.appendValueInput('condicion')
 			.appendField(Blockly.Msg["CONTROLS_IF_MSG_IF"]);
 		this.appendStatementInput('block').setCheck(["Statement"]);
@@ -4430,7 +4484,7 @@ Blockly.Blocks.AlternativaCompleta = {
 			"extensions": ["controls_if_tooltip"]
 		});
 
-		this.setColour(Blockly.GOBSTONES_COLORS.controlStructure);
+		this.setColour(Blockly.CUSTOM_COLORS.AlternativaCompleta || Blockly.CUSTOM_COLORS.controlStructure);
 		this.setInputsInline(true);
 
 		this.elseCount_++;
@@ -4493,7 +4547,7 @@ Blockly.Blocks.Poner = {
 					name: 'COLOR'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.primitiveCommand,
+			colour: Blockly.CUSTOM_COLORS.Poner || Blockly.CUSTOM_COLORS.primitiveCommand,
 			tooltip: 'Poner color en casillero.',
 			inputsInline: true
 		});
@@ -4513,7 +4567,7 @@ Blockly.Blocks.Sacar = {
 					name: 'COLOR'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.primitiveCommand,
+			colour: Blockly.CUSTOM_COLORS.Sacar || Blockly.CUSTOM_COLORS.primitiveCommand,
 			tooltip: 'Sacar color de casillero.',
 			inputsInline: true
 		});
@@ -4533,7 +4587,7 @@ Blockly.Blocks.Mover = {
 					name: 'DIRECCION'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.primitiveCommand,
+			colour: Blockly.CUSTOM_COLORS.Mover || Blockly.CUSTOM_COLORS.primitiveCommand,
 			tooltip: 'Mover en una dirección.',
 			inputsInline: true
 		});
@@ -4553,7 +4607,7 @@ Blockly.Blocks.IrAlBorde = {
 					name: 'DIRECCION'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.primitiveCommand,
+			colour: Blockly.CUSTOM_COLORS.IrAlBorde || Blockly.CUSTOM_COLORS.primitiveCommand,
 			tooltip: 'Ir al borde del tablero.',
 			inputsInline: true
 		});
@@ -4567,7 +4621,7 @@ Blockly.Blocks.VaciarTablero = {
 			previousStatement: "Statement",
 			nextStatement: "Statement",
 			message0: 'Vaciar tablero',
-			colour: Blockly.GOBSTONES_COLORS.primitiveCommand,
+			colour: Blockly.CUSTOM_COLORS.VaciarTablero || Blockly.CUSTOM_COLORS.primitiveCommand,
 			tooltip: 'Vaciar el tablero.',
 			inputsInline: true
 		});
@@ -4593,7 +4647,7 @@ Blockly.Blocks.BOOM = {
 				}
 			],
 			"inputsInline": false,
-			"colour": Blockly.GOBSTONES_COLORS.primitiveCommand,
+			"colour": Blockly.CUSTOM_COLORS.BOOM || Blockly.CUSTOM_COLORS.primitiveCommand,
 			"tooltip": "Este comando hace que estalle todo."
 		});
 	}
@@ -4613,7 +4667,7 @@ Blockly.Blocks.ComandoCompletar = {
 			"nextStatement": "Statement",
 			"lastDummyAlign0": "RIGHT",
 			"message0": "COMPLETAR",
-			"colour": Blockly.GOBSTONES_COLORS.complete,
+			"colour": Blockly.CUSTOM_COLORS.ComandoCompletar || Blockly.CUSTOM_COLORS.complete,
 			"tooltip": "Tenés que reemplazar este bloque por tu solución"
 		});
 	},
@@ -4629,7 +4683,7 @@ Blockly.Blocks.AsociacionDeTeclaCompletar = {
 			"nextStatement": "InteractiveBinding",
 			"lastDummyAlign0": "RIGHT",
 			"message0": "COMPLETAR",
-			"colour": Blockly.GOBSTONES_COLORS.complete,
+			"colour": Blockly.CUSTOM_COLORS.AsociacionDeTeclaCompletar || Blockly.CUSTOM_COLORS.complete,
 			"tooltip": "Tenés que reemplazar este bloque por tu solución"
 		});
 	},
@@ -4641,13 +4695,30 @@ Blockly.Blocks.AsociacionDeTeclaCompletar = {
 // Expresiones:
 // ------------------------------------------------------
 
+function deepCopyObj(aObject) {
+  var bObject, v, k;
+  bObject = Array.isArray(aObject) ? [] : {};
+  for (k in aObject) {
+    v = aObject[k];
+    bObject[k] = (typeof v === "object") ? deepCopyObj(v) : v;
+  }
+  return bObject;
+}
+
+const oldMathNumber = Blockly.Blocks.math_number;
+Blockly.Blocks.math_number = deepCopyObj(Blockly.Blocks.math_number);
+Blockly.Blocks.math_number.init = function() {
+	oldMathNumber.init.call(this);
+	this.setColour(Blockly.CUSTOM_COLORS.math_number || Blockly.CUSTOM_COLORS.literalExpression);
+}
+
 Blockly.Blocks.ExpresionCompletar = {
 	init: function () {
 		this.jsonInit({
 			"type": "completar_expression",
 			"message0": "COMPLETAR",
 			"output": "any",
-			"colour": Blockly.GOBSTONES_COLORS.complete,
+			"colour": Blockly.CUSTOM_COLORS.ExpresionCompletar || Blockly.CUSTOM_COLORS.complete,
 			"tooltip": "Tenés que reemplazar este bloque por tu solución"
 		});
 	},
@@ -4667,7 +4738,7 @@ function createLiteralSelectorBlock(type,values){
 					options: values.map(value => [value,value]),
 				}],
 				output: type,
-				colour: Blockly.GOBSTONES_COLORS.literalExpression,
+				colour: Blockly.CUSTOM_COLORS[`${type}Selector`] || Blockly.CUSTOM_COLORS.literalExpression,
 				tooltip: "Escoger " + type,
 			});
 		}
@@ -4689,7 +4760,7 @@ function createSingleParameterExpressionBlock(blockText,returnType){
 						name: 'VALUE'
 					}
 				],
-				colour: Blockly.GOBSTONES_COLORS.expression,
+				colour: Blockly.CUSTOM_COLORS[this.type] || Blockly.CUSTOM_COLORS.expression,
 				inputsInline: true,
 				output: returnType
 			})
@@ -4727,7 +4798,7 @@ Blockly.Blocks.OperadorDeComparacion = {
 					name: 'arg2'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.expression,
+			colour: Blockly.CUSTOM_COLORS.OperadorDeComparacion || Blockly.CUSTOM_COLORS.expression,
 			inputsInline: false,
 			output: 'Bool'
 		});
@@ -4756,7 +4827,7 @@ Blockly.Blocks.OperadorNumerico = {
 					name: 'arg2'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.expression,
+			colour: Blockly.CUSTOM_COLORS.OperadorNumerico || Blockly.CUSTOM_COLORS.expression,
 			inputsInline: false,
 			output: 'Number'
 		});
@@ -4775,7 +4846,7 @@ Blockly.Blocks.OperadorLogico = {
 				{
 					type: 'field_dropdown',
 					name: 'OPERATOR',
-					options: [['y también', '&&'], ['o bien', '||']]
+					options: [['y también', 'AND'], ['o bien', '||']]
 				},
 				{
 					type: 'input_dummy'
@@ -4785,7 +4856,7 @@ Blockly.Blocks.OperadorLogico = {
 					name: 'arg2'
 				}
 			],
-			colour: Blockly.GOBSTONES_COLORS.expression,
+			colour: Blockly.CUSTOM_COLORS.OperadorLogico || Blockly.CUSTOM_COLORS.expression,
 			inputsInline: false,
 			output: 'Bool'
 		});
@@ -4796,12 +4867,12 @@ Blockly.Blocks.Asignacion = {
 	init: function () {
 		this.jsonInit({
 			"type": "asignacion",
-			"message0": "%1 %2 := %3 %4",
+			"message0": "Recordar que %1 %2 vale %3 %4",
 			"args0": [
 				{
 				"type": "field_input",
 				"name": "varName",
-				"text": "nombre de variable",
+				"text": "una variable",
 				"class": Blockly.Procedures.rename
 				},
 				{
@@ -4818,11 +4889,24 @@ Blockly.Blocks.Asignacion = {
 			"inputsInline": true,
 			"previousStatement": null,
 			"nextStatement": null,
-			"colour": Blockly.GOBSTONES_COLORS.assignation,
+			"colour": Blockly.CUSTOM_COLORS.Asignacion || Blockly.CUSTOM_COLORS.assignation,
 			"tooltip": "",
 			"helpUrl": ""
 		});
-		this.getters = [];
+
+		var self = this;
+    var createGetterButton = new Blockly.FieldImage(
+      HAND,
+      16,
+      16,
+      "Obtener variable",
+      function() {
+      	var name = self.getFieldValue('varName');
+      	self.createVariableBlock(name);
+      }
+    );
+
+    this.appendDummyInput().appendField(createGetterButton);
 	},
 
 	customContextMenu: function(options) {
@@ -4837,20 +4921,7 @@ Blockly.Blocks.Asignacion = {
 		return Blockly.createBlockSvg(this.workspace, 'variables_get', b => {
 			b.setFieldValue(name, 'VAR');
 			b.moveBy(10,5);
-			b.parentAssignmentBlock = this;
-			this.getters.push(b);
 		});
-	},
-
-	removeGetter: function(block){
-		this.getters.splice(this.getters.indexOf(block),1);
-	},
-
-	onchange: function(event){
-		if(event.blockId == this.id && event.type == Blockly.Events.BLOCK_CHANGE &&
-			event.element == 'field'){
-			this.getters.forEach(block => block.setFieldValue(event.newValue,'VAR'));
-		};
 	}
 };
 
@@ -4862,13 +4933,13 @@ Blockly.Blocks.variables_get = {
 			"message0": "%1",
 			"args0": [
 				{
-				"type": "field_label",
+				"type": "field_input",
 				"name": "VAR",
 				"text": "nombre de variable"
 				}
 			],
 			"output": null,
-			"colour": 230,
+			"colour": Blockly.CUSTOM_COLORS.variable,
 			"tooltip": "",
 			"helpUrl": "",
 		});
@@ -4886,8 +4957,15 @@ Blockly.Blocks.variables_get = {
 	},
 
 	onchange: function(event){
-		if(event.blockId == this.id && event.type == Blockly.Events.BLOCK_DELETE){
-				this.parentAssignmentBlock.removeGetter(this);
+		if (this.$parent) {
+			this.getField("VAR").EDITABLE = false;
+			this.setColour(Blockly.CUSTOM_COLORS.parameter);
+		} else {
+			this.setColour(Blockly.CUSTOM_COLORS.variable);
+		}
+
+		if (event.blockId == this.id && event.type == Blockly.Events.BLOCK_DELETE) {
+			// do something with parent
 		}
 	}
 };
@@ -5269,6 +5347,7 @@ Blockly.GobstonesLanguage.OperadorNumerico = function (block) {
 Blockly.GobstonesLanguage.OperadorLogico = function(block) {
   // Operations 'and', 'or'.
 	var operator = block.getFieldValue('OPERATOR');
+	if (operator === "AND") operator = "&&";
 	var order = (operator == '&&') ? Blockly.GobstonesLanguage.ORDER_LOGICAL_AND : Blockly.GobstonesLanguage.ORDER_LOGICAL_OR;
 	var argument0 = Blockly.GobstonesLanguage.valueToCode(block, 'arg1', order) || '()';
 	var argument1 = Blockly.GobstonesLanguage.valueToCode(block, 'arg2', order) || '()';
@@ -5954,7 +6033,7 @@ Blockly.ErrorInforming.CssContent = [
                 for (var item of ttree) {
                   if (item.type !== "category") continue;
 
-                  if (item.name === BLOCKLY_PRIMITIVE_PROCEDURES)
+                  if (item.name === categoryName)
                     item.child = customTree;
                   else
                     addCustomActionsChilds(item.child);
@@ -6004,9 +6083,9 @@ Blockly.ErrorInforming.CssContent = [
         return xml.join('\n');
       },
 
-      _getPartsByConvention(name) {
+      _getPartsByConvention(isProcedure, name) {
         let parts = name.replace(/([A-Z])/g, " $1").toLowerCase();
-        parts = parts[1].toUpperCase() + parts.substring(2);
+        if (isProcedure) parts = parts[1].toUpperCase() + parts.substring(2);
         parts = this._getParts(parts);
 
         return parts;
@@ -6025,14 +6104,14 @@ Blockly.ErrorInforming.CssContent = [
         const icon = definition.attributes && definition.attributes.block_icon;
 
         const finalName = customName || name;
-        const parts = (customName ? this._getParts : this._getPartsByConvention)
+        const parts = (customName ? this._getParts : this._getPartsByConvention.bind(this, true))
           .bind(this)(finalName);
 
         // Bloque
         Blockly.Blocks[name] = {
         	init: function () {
             let argsIndex = 1;
-        		this.setColour(Blockly.GOBSTONES_COLORS.primitiveCommand);
+        		this.setColour(Blockly.CUSTOM_COLORS.primitiveProcedure);
             
             if (icon) {
               this.appendDummyInput().appendField(new Blockly.FieldImage(
@@ -6085,14 +6164,14 @@ Blockly.ErrorInforming.CssContent = [
         const icon = definition.attributes && definition.attributes.block_icon;
 
         const finalName = customName || name;
-        const parts = (customName ? this._getParts : this._getPartsByConvention)
+        const parts = (customName ? this._getParts : this._getPartsByConvention.bind(this, false))
           .bind(this)(finalName);
 
         // Bloque
         Blockly.Blocks[name] = {
           init: function () {
             let argsIndex = 1;
-            this.setColour(Blockly.GOBSTONES_COLORS.primitiveCommand);
+            this.setColour(Blockly.CUSTOM_COLORS.primitiveFunction);
 
             if (icon) {
               this.appendDummyInput().appendField(new Blockly.FieldImage(
@@ -6239,7 +6318,10 @@ Blockly.ErrorInforming.CssContent = [
       },
 
       _onWorkspaceUpdate: function () {
-        if(this.workspaceXml != this._blocklyWorkspaceXML) {
+        const hasReloadedXml = this._runWorkspaceXmlRetrocompatibilityFixes();
+        if (hasReloadedXml) return;
+
+        if (this.workspaceXml != this._blocklyWorkspaceXML) {
           this.workspace.clear();
           let dom = Blockly.Xml.textToDom(this.workspaceXml);
           try {
@@ -6258,6 +6340,16 @@ Blockly.ErrorInforming.CssContent = [
         }
       },
 
+      _runWorkspaceXmlRetrocompatibilityFixes: function() {
+        const oldAndOperator = `<field name="OPERATOR">&&</field>`;
+        const newAndOperator = `<field name="OPERATOR">AND</field>`;
+
+        if (this.workspaceXml.includes(oldAndOperator)) {
+          this.workspaceXml = this.workspaceXml.replace(new RegExp(oldAndOperator, "g"), newAndOperator);
+          return true;
+        }
+      },
+
       /**
        * Reinicializa el workspace, dejando solo el bloque programa
        */
@@ -6472,16 +6564,18 @@ Blockly.ErrorInforming.CssContent = [
       },
 
       testColors(colors) {
-        Blockly.GOBSTONES_COLORS = colors;
+        Blockly.CUSTOM_COLORS = colors;
         Blockly.HSV_SATURATION = colors.globalHsvSaturation; 
         Blockly.HSV_VALUE = colors.globalHsvValue;
-        Blockly.Constants.Math.HUE = colors.literalExpression;
-        Blockly.Msg.MATH_HUE = colors.literalExpression.toString();
         Blockly.Blocks.procedures.HUE = colors.procedure;
         
-        var xml = Blockly.Xml.workspaceToDom(this.workspace);
+        var xmlDom = Blockly.Xml.workspaceToDom(this.workspace);
+        const xml = Blockly.Xml.domToText(xmlDom);
         this.resetWorkspace();
-        Blockly.Xml.domToWorkspace(xml, this.workspace);
+
+        setTimeout(() => {
+          this.workspaceXml = xml;
+        }, 0);
       }
     });
   </script>

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.11.1"
+    VERSION = "0.11.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler