mumuki-gobstones-blockly 0.37.1 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88547c393fcedd81919aec55517f88961c02ba806ba3ba4fb5aec363e4ebdc99
-  data.tar.gz: 725ad912f884ea0b4108118dbc8c32ddf4ec498f29cdad27f8d3e8ead22d3942
+  metadata.gz: eb09d894eb7af40df20691a51e1fa10ffebce851b12f0cf9eafe23a31c64afee
+  data.tar.gz: 6340da945036f240c1ee72755c5e8e985e99610ea8d727f1f6f4e7c8a4a0754c
 SHA512:
-  metadata.gz: a2f7af4813edc25b9af1ad6f95ec9f2b2456004034d94b0ac69b61fc3ff3ab5232e2ba84c7e1e67af97c65fd08695ed6e3da88c7c0ec4e78d723e5676be8fda4
-  data.tar.gz: 01b7593d0cb27480b2af418ea7b11ddaa27e333eb8404655693ba7799dc3771efaf120973c920a59f66821f726af8b57b20f03b290188789abc02626d9f31c3d
+  metadata.gz: 5e088dd6494bbe4f717bfad1db51e56b48a1212aa29f6fe313d4ef4bff1281e80e3e07f405dc09eb6934dc0a89d7c69003f2b0d14fba9e3a6f29ae18cf7b584e
+  data.tar.gz: 50e07a3cf78731c4aa1e5c155b79b23d4c2e6d1f17bc672479b18af9971a329935c1ec0933ebb1711de48cd4913e21ac99fbb64ea3b8e23f86afb9c2d31fd7b8

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

@@ -3561,11 +3561,41 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
     returnMsg = Blockly.Msg.PROCEDURES_DEFRETURN_RETURN
   ) {
     return function() {
+      var self = this;
+
+      if ((this.workspace.options.comments ||
+            (this.workspace.options.parentWorkspace &&
+            this.workspace.options.parentWorkspace.options.comments)) &&
+          comment) {
+        this.setCommentText(comment);
+      }
+      this.setCommentText(null);
+      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_ = [];
+      this.statementConnection_ = null;      
+
       var defaultLegalName = Blockly.Procedures.findLegalName(defaultName, this);
       var nameField = new Blockly.FieldTextInput(defaultLegalName, Blockly.Procedures.rename);
       nameField.setSpellcheck(false);
 
-      var self = this;
+      if (Blockly.currentDisplayMode && !Blockly.currentDisplayMode().showText) {
+        nameField.setVisible(false);
+        const imageField = new Blockly.FieldImage(
+          Blockly.currentDisplayMode().procedureDefIcon,
+          Blockly.currentDisplayMode().iconSize,
+          Blockly.currentDisplayMode().iconSize
+        );
+        this.appendDummyInput().appendField(nameField, 'NAME').appendField(imageField);
+        this.setStatements_(withStatements);
+
+        return;
+      }
 
       // [!]
       var addParameterButton = new Blockly.FieldImage(
@@ -3592,24 +3622,7 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
       // if (withParametersMutator)
       //   this.setMutator(new Blockly.Mutator(['procedures_mutatorarg']));
 
-      if ((this.workspace.options.comments ||
-           (this.workspace.options.parentWorkspace &&
-            this.workspace.options.parentWorkspace.options.comments)) &&
-          comment) {
-        this.setCommentText(comment);
-      }
-      this.setCommentText(null);
-      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_ = [];
       this.setStatements_(withStatements);
-      this.statementConnection_ = null;
-
       // if (!withParametersMutator) this.updateParams_();
 
       // [!] adding create call button
@@ -4085,6 +4098,8 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
 </script>
   <script>/* global initProcedsBlockly */
 
+const EMPTY_GIF = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+
 Blockly.displayMode = 'text';
 
 Blockly.displayModes = {
@@ -4094,12 +4109,109 @@ Blockly.displayModes = {
   },
   iconic: {
     iconSize: 32,
-    showText: false
+    showText: false,
+    procedureDefIcon: EMPTY_GIF
   },
 };
 
 Blockly.currentDisplayMode = () => Blockly.displayModes[Blockly.displayMode];
 
+Blockly.CUSTOM_COLORS = {
+  globalHsvSaturation: 0.45,
+  globalHsvValue: 0.65,
+  primitiveCommand: "#1d3c99",
+  assignation: "#051d66",
+  controlStructure: "#0f2b80",
+  literalExpression: "#1d992c",
+  primitiveExpression: "#1d992c",
+  operator: "#0f801c",
+  program: "#8d1bb3",
+  interactiveProgram: "#6e158c",
+  interactiveBinding: "#a11fcc",
+  procedure: "#935ba6",
+  function: "#745380",
+  primitiveProcedure: "#2e4fb3",
+  primitiveFunction: "#2eb33e",
+  procedure_call: "#355bcc",
+  function_call: "#35cc47",
+  variable: "#056610",
+  parameter: "#056610",
+  complete: "#ff0000",
+  H: { commands: 225, expressions: 127, definitions: 285 },
+  S: {
+    assignation: 95,
+    variable: 95,
+    parameter: 95,
+    primitiveCommand: 81,
+    literalExpression: 81,
+    primitiveExpression: 81,
+    controlStructure: 88,
+    operator: 88,
+    procedure_call: 74,
+    function_call: 74,
+    primitiveProcedure: 74,
+    primitiveFunction: 74,
+    program: 85,
+    interactiveProgram: 85,
+    interactiveBinding: 85,
+    procedure: 45,
+    function: 35,
+    complete: 99,
+  },
+  V: {
+    assignation: 40,
+    variable: 40,
+    parameter: 40,
+    primitiveCommand: 60,
+    literalExpression: 60,
+    primitiveExpression: 60,
+    controlStructure: 50,
+    operator: 50,
+    procedure_call: 80,
+    function_call: 80,
+    primitiveProcedure: 70,
+    primitiveFunction: 70,
+    program: 70,
+    interactiveProgram: 55,
+    interactiveBinding: 80,
+    procedure: 65,
+    function: 50,
+    complete: 99,
+  },
+};
+
+Blockly.AVAILABLE_ICONS = [
+  "bool-false.svg",
+  "bool-true.svg",
+  "clean.png",
+  "color-azul.svg",
+  "color-negro.svg",
+  "color-rojo.svg",
+  "color-verde.svg",
+  "direccion-este.svg",
+  "direccion-norte.svg",
+  "direccion-oeste.svg",
+  "direccion-sur.svg",
+  "hand.png",
+  "minus.png",
+  "plus.png",
+  "repeticion-simple.png",
+  "program.png",
+  "procedure-def.png",
+];
+
+const getOptions = (block) => {
+  const parentWorkspace = block.workspace.options.parentWorkspace;
+  return parentWorkspace && parentWorkspace.options || block.workspace.options
+}
+const hasLocalMedia = (name) => Blockly.AVAILABLE_ICONS.includes(name)
+const getLocalMediaUrl = (block, name) =>
+  hasLocalMedia(name)
+    ? getOptions(block).localMedia + name + (getOptions(block).localMediaSuffix || "")
+    : EMPTY_GIF;
+const getLocalMediaSize = (name) =>
+  hasLocalMedia(name) ? Blockly.currentDisplayMode().iconSize : 0;
+
 // Initialize proceds-blockly creating new custom functions
 initProcedsBlockly("Statement", (makeProcedureInit, makeUpdateParams, makeProcedureDomToMutation, makeProcedureCustomMenu) => {
   Blockly.Blocks['DefinicionDeFuncionDeclarativa'] = {
@@ -4214,10 +4326,6 @@ initProcedsBlockly("Statement", (makeProcedureInit, makeUpdateParams, makeProced
   };
 });
 
-Blockly.CUSTOM_COLORS = {"globalHsvSaturation":0.45,"globalHsvValue":0.65,"primitiveCommand":"#1d3c99","assignation":"#051d66","controlStructure":"#0f2b80","literalExpression":"#1d992c","primitiveExpression":"#1d992c","operator":"#0f801c","program":"#8d1bb3","interactiveProgram":"#6e158c","interactiveBinding":"#a11fcc","procedure":"#935ba6","function":"#745380","primitiveProcedure":"#2e4fb3","primitiveFunction":"#2eb33e","procedure_call":"#355bcc","function_call":"#35cc47","variable":"#056610","parameter":"#056610","complete":"#ff0000","H":{"commands":225,"expressions":127,"definitions":285},"S":{"assignation":95,"variable":95,"parameter":95,"primitiveCommand":81,"literalExpression":81,"primitiveExpression":81,"controlStructure":88,"operator":88,"procedure_call":74,"function_call":74,"primitiveProcedure":74,"primitiveFunction":74,"program":85,"interactiveProgram":85,"interactiveBinding":85,"procedure":45,"function":35,"complete":99},"V":{"assignation":40,"variable":40,"parameter":40,"primitiveCommand":60,"literalExpression":60,"primitiveExpression":60,"controlStructure":50,"operator":50,"procedure_call":80,"function_call":80,"primitiveProcedure":70,"primitiveFunction":70,"program":70,"interactiveProgram":55,"interactiveBinding":80,"procedure":65,"function":50,"complete":99}};
-Blockly.AVAILABLE_ICONS = ["bool-false.svg","bool-true.svg","clean.png","color-azul.svg","color-negro.svg","color-rojo.svg","color-verde.svg","direccion-este.svg","direccion-norte.svg","direccion-oeste.svg","direccion-sur.svg","hand.png","minus.png","plus.png", "repeticion-simple.png", "program.png"];
-const EMPTY_GIF = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-
 const ATOMICALLY = (action) => {
   try {
     Blockly.Events.disabled_ = 1;
@@ -4227,18 +4335,6 @@ const ATOMICALLY = (action) => {
   }
 }
 
-const getOptions = (block) => {
-  const parentWorkspace = block.workspace.options.parentWorkspace;
-  return parentWorkspace && parentWorkspace.options || block.workspace.options
-}
-const hasLocalMedia = (name) => Blockly.AVAILABLE_ICONS.includes(name)
-const getLocalMediaUrl = (block, name) =>
-  hasLocalMedia(name)
-    ? getOptions(block).localMedia + name + (getOptions(block).localMediaSuffix || "")
-    : EMPTY_GIF;
-const getLocalMediaSize = (name) =>
-  hasLocalMedia(name) ? Blockly.currentDisplayMode().iconSize : 0;
-
 /**
  * Create the svg representation of a block and render
  * @name {!string} name of the parameter.
@@ -4651,14 +4747,14 @@ Blockly.Blocks.RepeticionSimple = {
     if (Blockly.currentDisplayMode().showText) {
       this.appendValueInput("count").appendField("repetir");
       this.appendDummyInput().appendField("veces");
+      this.setInputsInline(true);
     } else {
       const icon = "repeticion-simple.png";
-      const imageField = this.appendDummyInput().appendField(new Blockly.FieldImage(
+      const imageField = this.appendValueInput("count").appendField(new Blockly.FieldImage(
         '',
         getLocalMediaSize(icon),
         getLocalMediaSize(icon)
       ));
-      this.appendValueInput("count");
 
       // El atributo localMedia recién va a estar disponible cuando termine de cargar el toolbox,
       // por eso la imagen se carga en el evento y no directamente más arriba.
@@ -4666,7 +4762,6 @@ Blockly.Blocks.RepeticionSimple = {
     }
 
     this.appendStatementInput('block').setCheck(["Statement"]);
-    this.setInputsInline(true);
   }
 };
 
@@ -6721,6 +6816,14 @@ Blockly.ErrorInforming.CssContent = [
             value: false
         },
 
+        /*
+         * Cantidad máxima de bloques permitidos en el workspace. Si no se le da ningún valor, se admiten infinitos bloques.
+         */
+        maxBlocks: {
+          type: Number,
+          value: null
+        },
+
         /*
          * Si el valor es `false`, "aplana" las categorías dejando todos los bloques sueltos en el toolbox.
          */
@@ -7316,6 +7419,16 @@ Blockly.ErrorInforming.CssContent = [
         }
       },
 
+      /**
+       * Agrega un listener que se ejecutará cada vez que los bloques del workspace cambien
+       */
+      onBlocksChanged(action) {
+        this.workspace.addChangeListener(() => action({
+          remainingCapacity: this.workspace.remainingCapacity(),
+          workspace: this.workspace
+        }));
+      },
+
       /**
        * Reinicializa el workspace, dejando solo el bloque programa
        */
@@ -7491,6 +7604,7 @@ Blockly.ErrorInforming.CssContent = [
           collapse: true,
           css: true,
           readOnly: this.readOnly,
+          maxBlocks: this.maxBlocks,
           zoom: {
             controls: true,
             wheel: true

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.37.1"
+    VERSION = "0.38.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.38.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler