gobstones-blockly 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19102f18fe884ada71c61e02008d9ff2fafdf22c24c1832f22fd170ba8d7e902
-  data.tar.gz: 8c75c63fdf6e00d0d2676befdb34232d1c3ce5c6ead05d9d1d687a25dbaed2a6
+  metadata.gz: 2df8843605a77958cbbbc8363ab494219698cb9b1a98210fd2f2bf1a0d257811
+  data.tar.gz: 7dc56f808fc135e8dc0917fea99c4be2a6f8ea80620b4d36a9ddb3753da5b632
 SHA512:
-  metadata.gz: ad6d4ec5d991561a4466ca6a9312fb3c1287921c25ab28d70b6a7e9027249d5c7b8dcae0dd45351f88c9fb2e1fd5bfc0a4d1e1790f41fdf31d740da80acfb6b4
-  data.tar.gz: f316a50083297191866808586830391bb091c251a66640dafdb6af5a9dcefb09a795400f9b2647c0d470def4c5a7ed7bced2357f3fcb19825d68d5b65e4142ce
+  metadata.gz: bf3e0ae742217b6572f3ac7908977b80dccef29b4ec8222d4e8d3897351b766de195074fc8a2b5ff6a426753ab05d5fd9dacf7f4a6ba3de66c1ec85ed963ddd8
+  data.tar.gz: e313b428e16d901ff92cd09a436598e99caed19cfe1ae5116f06adc88823ad3a8a5b1aa64b804a333546cc89c66067be5a5b337c5ae8237727ff19ed3c9d8bac

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

@@ -63,6 +63,7 @@ Example:
           <block type="ColorSelector"></block>
           <block type="DireccionSelector"></block>
           <block type="BoolSelector"></block>
+          <block type="List"></block>
         </category>
         <category name="Expresiones primitivas">
           <block type="hayBolitas"></block>
@@ -4177,7 +4178,7 @@ Blockly.Blocks.InteractiveProgram = {
 	_addInit() {
 		this.$init = true;
 
-    const icon = "minnus.png";
+    const icon = "minus.png";
 		var removeButton = new Blockly.FieldImage(
 			getLocalMediaUrl(this, icon),
 			getLocalMediaSize(icon),
@@ -4278,8 +4279,7 @@ createInteractiveBinding = (name, keys) => {
 						options: keys.map(it => [it.name, it.code]),
 					}
 				],
-				colour: Blockly.CUSTOM_COLORS.InteractiveBinding || Blockly.CUSTOM_COLORS.interactiveBinding,
-				tooltip: "Escoger una entrada",
+				colour: Blockly.CUSTOM_COLORS.InteractiveBinding || Blockly.CUSTOM_COLORS.interactiveBinding
 			});
 
       this.appendStatementInput('block').setCheck(["Statement"]);
@@ -4849,6 +4849,95 @@ Blockly.Blocks.ColorSelector = createLiteralSelectorBlock('Color',['Rojo','Verde
 Blockly.Blocks.DireccionSelector = createLiteralSelectorBlock('Direccion',['Este','Oeste','Norte','Sur']);
 Blockly.Blocks.BoolSelector = createLiteralSelectorBlock('Bool',['True','False']);
 
+Blockly.Blocks.List = {
+  init: function () {
+    const type = "List";
+
+    this.jsonInit({
+      type: type,
+      message0: "[",
+      args0: [],
+      output: type,
+      colour: Blockly.CUSTOM_COLORS.list || Blockly.CUSTOM_COLORS.literalExpression,
+      inputsInline: false
+    });
+
+    this._addAddButton();
+    this.length = 0;
+  },
+
+  mutationToDom: function() {
+    var container = document.createElement('mutation');
+    container.setAttribute('length', this.length);
+    return container;
+  },
+
+  domToMutation: function(xmlElement) {
+    var length = parseInt(xmlElement.getAttribute('length')) || 0;
+    for (let i = 0; i < length; i++) this._addElement();
+  },
+
+  _addElement: function() {
+    this.length++;
+    this._removeAddButton();
+    const input = this.appendValueInput('element' + this.length);
+    this._addRemoveButtonFor(input);
+    this._addAddButton();
+  },
+
+  _removeElement: function(input) {
+    this.removeInput(input.name);
+    this.length--;
+
+    let id = 1;
+    for (let input of this.inputList) {
+      if (input.name.startsWith("element")) {
+        input.name = "element" + id;
+        id++;
+      }
+    }
+  },
+
+  _addAddButton: function() {
+    const icon = "plus.png";
+    var addButton = new Blockly.FieldImage(
+      getLocalMediaUrl(this, icon),
+      getLocalMediaSize(icon),
+      getLocalMediaSize(icon),
+      "Agregar elemento",
+      function() {
+        this._addElement();
+      }.bind(this)
+    );
+    const input = this.appendDummyInput();
+    input.appendField(addButton);
+    input.name = "addButton";
+
+    const closingBracket = this.appendDummyInput();
+    closingBracket.appendField("]");
+    closingBracket.name = "closingBracket";
+  },
+
+  _removeAddButton: function() {
+    this.removeInput("addButton")
+    this.removeInput("closingBracket");
+  },
+
+  _addRemoveButtonFor: function(input) {
+    const icon = "minus.png";
+    var removeButton = new Blockly.FieldImage(
+      getLocalMediaUrl(this, icon),
+      getLocalMediaSize(icon),
+      getLocalMediaSize(icon),
+      "Quitar elemento",
+      function() {
+        this._removeElement(input);
+      }.bind(this)
+    );
+    input.appendField(removeButton);
+  }
+};
+
 function createSingleParameterExpressionBlock(blockText,returnType, colorType = "operator"){
 	return {
 		init: function () {
@@ -5478,6 +5567,17 @@ Blockly.GobstonesLanguage.ColorSelector = literalSelectorBlockCodeGenerator('Col
 Blockly.GobstonesLanguage.DireccionSelector = literalSelectorBlockCodeGenerator('Direccion');
 Blockly.GobstonesLanguage.BoolSelector = literalSelectorBlockCodeGenerator('Bool');
 
+Blockly.GobstonesLanguage.List = function(block) {
+  const elements = block
+    .inputList
+    .filter((it) => it.name.startsWith("element"))
+    .map((it) => Blockly.GobstonesLanguage.valueToCode(block, it.name, Blockly.GobstonesLanguage.ORDER_NONE))
+    .join(", ");
+  const code = `[${elements}]`;
+
+  return [code, Blockly.GobstonesLanguage.ORDER_ATOMIC];
+};
+
 Blockly.GobstonesLanguage.OperadorDeComparacion = function (block) {
 	var code =
 		(Blockly.GobstonesLanguage.valueToCode(block, 'arg1', Blockly.GobstonesLanguage.ORDER_RELATIONAL) || '()') +
@@ -6572,6 +6672,8 @@ Blockly.ErrorInforming.CssContent = [
         const oldAndOperator = `<field name="OPERATOR">&&</field>`;
         const newAndOperator = `<field name="OPERATOR">AND</field>`;
 
+        if (!this.workspaceXml) return;
+
         if (this.workspaceXml.includes(oldAndOperator)) {
           this.workspaceXml = this.workspaceXml.replace(new RegExp(oldAndOperator, "g"), newAndOperator);
           return true;

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.22.0"
+    VERSION = "0.23.0"
   end
 end

metadata

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