gobstones-blockly 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df4f3cb3085b99b2ab4961e794ce837134096999868a450215dfd0d074d3144
-  data.tar.gz: d2038c6e78c197d2d440de7d570ad3786995d782c43edfa35939067aca23b078
+  metadata.gz: c2384d6d8481183557687355b137fbbb8fe932ab9afa0bbe488dc09afb971a2d
+  data.tar.gz: b101ff1dce50e9e46237368c8b5cb6658fbe0c1dc221cbb2a09720ecbb31346c
 SHA512:
-  metadata.gz: 7f59e43a5bd79c13e53a4fb6129253f3b1aae0d8d740e249d67d1c82cb30a08d851aa1bbb4f7a0d15f7559d9f24cebe95461ee7104c6809cd6ba3482c9f1d76f
-  data.tar.gz: b6004a73a82b3f898a0905e941c65cd4136c3d5b9a47d9e8f1630d0b757e23ff7eb9a149edf7768d17a1dcc09e0b120a73e6451e7732e640c398460e7d85f652
+  metadata.gz: 6c1e7fd5e83ad4aa5c3b53ee4c2b786998d63e22619183e5c743a05734a108129740ef4f64cfd1f3aefeb8095c2c96054e3f82455332e9483fe9d06bdc6f7344
+  data.tar.gz: 519449f5493aecdf7c7270f82baa6aef2cdb922ebd49193bf8db259de35a238cafc91d5ccf3eb40f0741dc3a195ea3f8d67c9ba0ecb3371e8df29f1b2ed315f9

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

@@ -4042,27 +4042,7 @@ var CLEAN = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYEAYAAACw5+G7A
 
 /* global Blockly */
 
-Blockly.CUSTOM_COLORS = {
-	globalHsvSaturation: Blockly.HSV_SATURATION,
-	globalHsvValue: Blockly.HSV_VALUE,
-	primitiveCommand: "#8DA65B",
-	assignation: "#5B68A6",
-	controlStructure: "#A6A65B",
-	literalExpression: "#5BA6A6",
-	expression: "#745BA6",
-	program: "#74A65B",
-	interactiveProgram: "#A6805B",
-	interactiveBinding: "#A6995B",
-	procedure: "#995BA6",
-	function: "#774A77",
-	primitiveProcedure: "#CACACA",
-	primitiveFunction: "#BABABA",
-	procedure_call: "#661CF6",
-	function_call: "#330610",
-	variable: "#FF0000",
-	parameter: "#0000FF",
-	complete: "#A65C5B",
-};
+Blockly.CUSTOM_COLORS = {"globalHsvSaturation":0.45,"globalHsvValue":0.65,"primitiveCommand":"#1d48cc","assignation":"#14328c","controlStructure":"#193fb3","literalExpression":"#48cc1d","primitiveExpression":"#48cc1d","operator":"#3fb319","program":"#ae25db","interactiveProgram":"#731991","interactiveBinding":"#ae25db","procedure":"#915ba3","function":"#745380","primitiveProcedure":"#2351db","primitiveFunction":"#51db23","procedure_call":"#3163f7","function_call":"#63f731","variable":"#328c14","parameter":"#328c14","complete":"#fc0303","H":{"commands":225,"expressions":105,"definitions":285},"S":{"assignation":86,"variable":86,"parameter":86,"primitiveCommand":86,"literalExpression":86,"primitiveExpression":86,"controlStructure":86,"operator":86,"procedure_call":80,"function_call":80,"primitiveProcedure":84,"primitiveFunction":84,"program":83,"interactiveProgram":83,"interactiveBinding":83,"procedure":44,"function":35,"complete":99},"V":{"assignation":55,"variable":55,"parameter":55,"primitiveCommand":80,"literalExpression":80,"primitiveExpression":80,"controlStructure":70,"operator":70,"procedure_call":97,"function_call":97,"primitiveProcedure":86,"primitiveFunction":86,"program":86,"interactiveProgram":57,"interactiveBinding":86,"procedure":64,"function":50,"complete":99}};
 
 /**
  * Create the svg representation of a block and render
@@ -4785,7 +4765,7 @@ Blockly.Blocks.ColorSelector = createLiteralSelectorBlock('Color',['Rojo','Verde
 Blockly.Blocks.DireccionSelector = createLiteralSelectorBlock('Direccion',['Este','Oeste','Norte','Sur']);
 Blockly.Blocks.BoolSelector = createLiteralSelectorBlock('Bool',['True','False']);
 
-function createSingleParameterExpressionBlock(blockText,returnType){
+function createSingleParameterExpressionBlock(blockText,returnType, colorType = "operator"){
 	return {
 		init: function () {
 			this.jsonInit({
@@ -4796,7 +4776,7 @@ function createSingleParameterExpressionBlock(blockText,returnType){
 						name: 'VALUE'
 					}
 				],
-				colour: Blockly.CUSTOM_COLORS[this.type] || Blockly.CUSTOM_COLORS.expression,
+				colour: Blockly.CUSTOM_COLORS[this.type] || Blockly.CUSTOM_COLORS[colorType],
 				inputsInline: true,
 				output: returnType
 			})
@@ -4804,9 +4784,9 @@ function createSingleParameterExpressionBlock(blockText,returnType){
 	};
 }
 
-Blockly.Blocks.hayBolitas = createSingleParameterExpressionBlock('hay bolitas','Bool');
-Blockly.Blocks.puedeMover = createSingleParameterExpressionBlock('puede mover','Bool');
-Blockly.Blocks.nroBolitas = createSingleParameterExpressionBlock('numero de bolitas','Number');
+Blockly.Blocks.hayBolitas = createSingleParameterExpressionBlock('hay bolitas','Bool', "primitiveExpression");
+Blockly.Blocks.puedeMover = createSingleParameterExpressionBlock('puede mover','Bool', "primitiveExpression");
+Blockly.Blocks.nroBolitas = createSingleParameterExpressionBlock('numero de bolitas','Number', "primitiveExpression");
 
 // ------------------------------------------------------
 // Operaciones:
@@ -4834,7 +4814,7 @@ Blockly.Blocks.OperadorDeComparacion = {
 					name: 'arg2'
 				}
 			],
-			colour: Blockly.CUSTOM_COLORS.OperadorDeComparacion || Blockly.CUSTOM_COLORS.expression,
+			colour: Blockly.CUSTOM_COLORS.OperadorDeComparacion || Blockly.CUSTOM_COLORS.operator,
 			inputsInline: false,
 			output: 'Bool'
 		});
@@ -4863,7 +4843,7 @@ Blockly.Blocks.OperadorNumerico = {
 					name: 'arg2'
 				}
 			],
-			colour: Blockly.CUSTOM_COLORS.OperadorNumerico || Blockly.CUSTOM_COLORS.expression,
+			colour: Blockly.CUSTOM_COLORS.OperadorNumerico || Blockly.CUSTOM_COLORS.operator,
 			inputsInline: false,
 			output: 'Number'
 		});
@@ -4892,7 +4872,7 @@ Blockly.Blocks.OperadorLogico = {
 					name: 'arg2'
 				}
 			],
-			colour: Blockly.CUSTOM_COLORS.OperadorLogico || Blockly.CUSTOM_COLORS.expression,
+			colour: Blockly.CUSTOM_COLORS.OperadorLogico || Blockly.CUSTOM_COLORS.operator,
 			inputsInline: false,
 			output: 'Bool'
 		});
@@ -6611,7 +6591,7 @@ Blockly.ErrorInforming.CssContent = [
 
         setTimeout(() => {
           this.workspaceXml = xml;
-        }, 0);
+        }, 1);
       }
     });
   </script>

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

metadata

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