gobstones-blockly 0.29.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5463872ab87a752ec1f0061775e4e9dddb1943a1497ca1696ec82338e9eb3b7
-  data.tar.gz: ef29461291eff352fcfc20632d047c8d894c9478fab08e90e1587d8c40474f48
+  metadata.gz: 535de373bc92627bf98a2b3c90f9d00ab61e074ef94b99a9e8f15bc6c7b248d3
+  data.tar.gz: 5f72b025962136ab74f71f23e10884cae99d8fa944ae752fa7a6309f1deb1d6b
 SHA512:
-  metadata.gz: 901c46fb4bf1d2011b99646d7c11498edc7012a3f55675cac812a74a413c9aeddd06be90f7f31980c67c75ce444c58b0a501eb7fa5fac943c1bc9d5e730f44ce
-  data.tar.gz: c56fc598356c69a59b9474b87156969fa4dae66c873221e7a038dc2d632c941562272726a1543ab7f616e639ad839412d9f0b8160a8eed6e4f59ba0f4c962aa0
+  metadata.gz: adfb423ee734fcad637dfc359a0623a6c680b28f0b5998d15d7d9f7d5ad5ef4a4bb2d1afc4c66687504103f2cd1dbd04ff295019b23ec9cb4cab5b0fab3c9876
+  data.tar.gz: b671355f1238b308c49b913ba0d5dd596c23b09da204c1a0f17d376d3ff910587a6378b757bbcb1fbdc9912b172ea10dd60932f67efb8b1b06210b31a7e9339e

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

@@ -3413,11 +3413,23 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
     xmlBlock.setAttribute('type', 'variables_get');
 
     var callback = Blockly.ContextMenu.callbackFactory(procedureBlock, xmlBlock);
-    
+
     return function() {
       var block = callback();
       block.$parent = procedureBlock.id;
-      block.moveBy(procedureBlock.width, -14);
+
+      try {
+        Blockly.Events.disabled_ = 1;
+        const posParent = procedureBlock.getRelativeToSurfaceXY();
+        const pos = block.getRelativeToSurfaceXY();
+        let width = procedureBlock.width;
+        const returnBlock = procedureBlock.inputList.find((it) => it.name === "RETURN");
+        if (returnBlock) width -= returnBlock.renderWidth - 8;
+
+        block.moveBy(posParent.x - pos.x + width + 16, posParent.y - pos.y + 6);
+      } finally {
+        Blockly.Events.disabled_ = 0;
+      }
     };
   };
 
@@ -3485,7 +3497,7 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
         newName = getAvailableName(self, newName);
 
       self.arguments_[i] = newName;
-      
+
       var blocks = self.workspace.getAllBlocks();
       for (block of blocks) {
         if (block.type === self.callType_ && block.getProcedureCall() === self.getProcedureDef()[0]) {
@@ -3512,7 +3524,7 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
       .appendField(nameField, 'ARG' + i)
       .appendField(createCallButton)
       .appendField(removeParameterButton);
-  
+
     self.moveInputBefore(id, 'STACK');
   };
 
@@ -3617,7 +3629,22 @@ window.initProcedsBlockly = function(customStatementType, initialize = () => {})
           var xmlBlock = goog.dom.createDom('block', null, xmlMutation);
           xmlBlock.setAttribute('type', self.callType_);
 
-          Blockly.ContextMenu.callbackFactory(self, xmlBlock)();
+          const block = Blockly.ContextMenu.callbackFactory(self, xmlBlock)();
+
+          try {
+            const procedureBlock = self;
+
+            Blockly.Events.disabled_ = 1;
+            const posParent = procedureBlock.getRelativeToSurfaceXY();
+            const pos = block.getRelativeToSurfaceXY();
+            let width = procedureBlock.width;
+            const returnBlock = procedureBlock.inputList.find((it) => it.name === "RETURN");
+            if (returnBlock) width -= returnBlock.renderWidth - 8;
+
+            block.moveBy(posParent.x - pos.x + width + 16, posParent.y - pos.y + 6);
+          } finally {
+            Blockly.Events.disabled_ = 0;
+          }
         }
       );
       input.appendField(createCallButton);
@@ -4175,6 +4202,15 @@ Blockly.CUSTOM_COLORS = {"globalHsvSaturation":0.45,"globalHsvValue":0.65,"primi
 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"];
 const EMPTY_GIF = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
 
+const ATOMICALLY = (action) => {
+  try {
+    Blockly.Events.disabled_ = 1;
+    action();
+  } finally {
+    Blockly.Events.disabled_ = 0;
+  }
+}
+
 const getOptions = (block) => {
   const parentWorkspace = block.workspace.options.parentWorkspace;
   return parentWorkspace && parentWorkspace.options || block.workspace.options
@@ -4202,11 +4238,12 @@ Blockly.createBlockSvg = function(workspace, name, f) {
 const createVariable = (parent, name) => {
   const workspace = parent.workspace;
   Blockly.createBlockSvg(workspace, 'variables_get', b => {
-    b.setFieldValue(name, 'VAR');
-
-    const posParent = parent.getRelativeToSurfaceXY();
-    const pos = b.getRelativeToSurfaceXY();
-    b.moveBy(posParent.x - pos.x + parent.width + 16, posParent.y - pos.y + b.height + 6);
+    ATOMICALLY(() => {
+      b.setFieldValue(name, 'VAR');
+      const posParent = parent.getRelativeToSurfaceXY();
+      const pos = b.getRelativeToSurfaceXY();
+      b.moveBy(posParent.x - pos.x + parent.width + 16, posParent.y - pos.y + b.height + 6);
+    });
   });
 }
 

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.29.0"
+    VERSION = "0.29.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Rodrigo Alfonso