gobstones-blockly 0.25.4 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f1724c6b0a4a16cd5c195c49f8522ce2d767c399f763b76b33a374030166b61
-  data.tar.gz: da6e64d1f72c97205348d784c00ce25fe58e18f669a0cec8f64ce6f223c896a7
+  metadata.gz: 29902334f56b93fd4cef18ef000f6503f536f50db2367928e8d89bea3aaf0876
+  data.tar.gz: 7370abf521aa0634c477ad8a267e725e4d253c3165221f1ae1c3d5f61b2c89c1
 SHA512:
-  metadata.gz: a9151bc2d8418ef276fd330a93f84843c9aa6fbd8b18cc1ff8ea57183867c4128b5f0082d465812d9f17980c6e0482509bc5268512084e8401cd3a1faac5d19c
-  data.tar.gz: d01bd53765fe70ee268376909540c64da93b79880c4e5b690a23063f0255aa0bd301cee2a309b432423ec0f5ec6eebda9edf7450c86d53d441532dcb9ed61c6c
+  metadata.gz: cfd32117eb21e74db5ce2610c2df787c444b0a7bbfd5a5fa5473f00e859cdbbb293d599a0577a6298f9acfd3414735ee1e0e6fab2515b1c5caaf1b890efb1134
+  data.tar.gz: d10e980e304acbd0966921c63228790159c037fc6d5d44ed13274c62918bed40237818158b1f9c6323eba8275e9e7b76bd1731eb89ba29a1fd35ffa05acf097f

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

@@ -80,9 +80,7 @@ Example:
           <block type="OperadorDeComparacion"></block>
           <block type="OperadorLogico"></block>
           <block type="not"></block>
-          <block type="siguiente"></block>
-          <block type="previo"></block>
-          <block type="opuesto"></block>
+          <block type="OperadoresDeEnumeracion"></block>
         </category>
       </category>
       <category name="Definiciones">
@@ -90,7 +88,7 @@ Example:
           <block type="Program"></block>
           <block type="InteractiveProgram"></block>
         </category>
-        <category name="Asociaciones">
+        <category name="Eventos">
           <block type="InteractiveLetterBinding"></block>
           <block type="InteractiveNumberBinding"></block>
           <block type="InteractiveKeyBinding"></block>
@@ -105,7 +103,7 @@ Example:
           <block type="procedures_defreturn"></block>
         </category>
       </category>
-      <category name="Auxiliares Docente">
+      <category name="Auxiliares Docente" gbs_visible="teacher">
         <block type="ComandoCompletar"></block>
         <block type="ExpresionCompletar"></block>
         <block type="AsociacionDeTeclaCompletar"></block>
@@ -5280,14 +5278,12 @@ Blockly.Blocks.siguiente = createSingleParameterExpressionBlock('siguiente','*')
 Blockly.Blocks.previo = createSingleParameterExpressionBlock('previo','*');
 Blockly.Blocks.opuesto = createSingleParameterExpressionBlock('opuesto','*');
 
-
 // Necesario para sanitizar nombres de procedimientos.
 // En la interfaz de bloques de gobstones por ahora vamos a dejar pasar sólo espacios y letras con tilde
 Blockly.Blocks.GobstonesSanitizer = function(name){
   return name.replace(/[^A-Za-z0-9ÁÉÍÓÚÑáéíóúñ_ ]/g,'');
 };
 
-
 Blockly.Procedures.OldRename = Blockly.Procedures.rename;
 Blockly.Procedures.rename = function(name){
   return Blockly.Procedures.OldRename.call(this,
@@ -5302,6 +5298,35 @@ Blockly.Blocks.procedures_mutatorarg.validator_ = function(name){
   return Blockly.Blocks.procedures_mutatorarg.validator_old.call(this,
     Blockly.Blocks.GobstonesSanitizer(name));
 };
+
+// Enable/Disable atomic
+const oldProceduresCustomContextMenu = Blockly.Blocks.procedures_defnoreturn.customContextMenu
+Blockly.Blocks.procedures_defnoreturn.customContextMenu = function(options) {
+  oldProceduresCustomContextMenu.call(this, options);
+
+  const block = this;
+  options.splice(1, 0, {
+    enabled: true,
+    text: block.$isAtomic ? "✗ Mostrar paso a paso" : "✓ Mostrar paso a paso",
+    callback: function() {
+      block.$isAtomic = !block.$isAtomic;
+      triggerRefresh(block);
+    }
+  })
+}
+const oldProceduresMutationToDom = Blockly.Blocks['procedures_defnoreturn'].mutationToDom;
+Blockly.Blocks.procedures_defnoreturn.mutationToDom = function() {
+  const container = oldProceduresMutationToDom.call(this);
+  container.setAttribute("isatomic", this.$isAtomic ? "true" : "false");
+  return container;
+}
+const oldProceduresDomToMutation = Blockly.Blocks['procedures_defnoreturn'].domToMutation;
+Blockly.Blocks.procedures_defnoreturn.domToMutation = function(xmlElement) {
+  const isAtomic = xmlElement.getAttribute("isatomic");
+  this.$isAtomic = isAtomic === "true";
+
+  return oldProceduresDomToMutation.call(this, xmlElement);
+}
 </script>
   <script>/* global Blockly, goog */
 /* eslint camelcase: "off" */
@@ -5844,11 +5869,11 @@ var makeParameterList = function (block) {
 };
 
 Blockly.GobstonesLanguage.procedures_defnoreturn = function (block) {
-	var name = formatCallName(block.getFieldValue('NAME'),true);
-	var body = Blockly.GobstonesLanguage.statementToCode(block, 'STACK');
+  var name = formatCallName(block.getFieldValue('NAME'),true);
+  var body = Blockly.GobstonesLanguage.statementToCode(block, 'STACK');
 
-	var code = 'procedure ' + name + '(' + makeParameterList(block) + ') {\n' +
-		body + '}\n';
+  var code = 'procedure ' + name + '(' + makeParameterList(block) + ') {\n' + body + '}\n';
+  if (block.$isAtomic) code = "/*@ATTRIBUTE@atomic@*/" + "\n" + code;
 
 	code = Blockly.GobstonesLanguage.scrub_(block, code);
 	Blockly.GobstonesLanguage.definitions_[name] = code;
@@ -6161,6 +6186,14 @@ Blockly.ErrorInforming.CssContent = [
           type: Boolean,
         },
 
+        /*
+         * `role` Indica el role del usuario ("teacher" || "student").
+         */
+        role: {
+          type: String,
+          value: "teacher"
+        },
+
         /*
          * `width` Ancho del elemento.
          */
@@ -6869,8 +6902,9 @@ Blockly.ErrorInforming.CssContent = [
 
           const name = node.getAttribute("name");
           const custom = node.getAttribute("gbs_custom");
+          const visible = node.getAttribute("gbs_visible");
 
-          if (custom === "SEPARATOR") {
+          if (custom === "SEPARATOR" || visible !== null) {
             const toolbar = document.querySelector("#blocklyDiv div div div").childNodes[1];
 
             forEachNode(toolbar, (toolbarNode) => {
@@ -6878,23 +6912,27 @@ Blockly.ErrorInforming.CssContent = [
               const isTheRightCategory = toolbarNode.textContent === name;
 
               if (isLabel && isTheRightCategory) {
-                const row = toolbarNode.parentElement;
-                row.style["pointer-elements"] = "none";
-                row.style["background"] = "#15546f";
-                row.style["color"] = "#ffffff";
-                row.style["margin-top"] = "8px";
-                row.style["margin-bottom"] = "8px";
-                row.style["pointer-events"] = "none";
-                row.style["user-select"] = "none";
-
-                if (toolbarNode.innerHTML.startsWith("*")) {
-                  row.style["margin-top"] = "0";
-                  row.style["margin-bottom"] = "-8px";
-                  row.style["font-weight"] = "900";
-                  toolbarNode.innerHTML = toolbarNode.innerHTML.replace("*", "");
+                if (custom === "SEPARATOR") {
+                  const row = toolbarNode.parentElement;
+                  row.style["pointer-elements"] = "none";
+                  row.style["background-image"] = "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4wEVFRcgIqOIVAAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAADUlEQVQI12MQDcn/DwADMgHYjceGPAAAAABJRU5ErkJggg==)";
+                  row.style["color"] = "#ffffff";
+                  row.style["margin-top"] = "8px";
+                  row.style["margin-bottom"] = "8px";
+                  row.style["pointer-events"] = "none";
+                  row.style["user-select"] = "none";
+
+                  if (toolbarNode.innerHTML.startsWith("*")) {
+                    row.style["margin-top"] = "0";
+                    row.style["margin-bottom"] = "-8px";
+                    row.style["font-weight"] = "900";
+                    toolbarNode.innerHTML = toolbarNode.innerHTML.replace("*", "");
+                  }
+
+                  toolbarNode.innerHTML = `<span>${toolbarNode.innerHTML}</span>`;
+                } else if (visible !== null && visible !== this.role) {
+                  toolbarNode.remove();
                 }
-
-                toolbarNode.innerHTML = `<span>${toolbarNode.innerHTML}</span>`;
               }
             });
           }

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.25.4"
+    VERSION = "0.28.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.25.4
+  version: 0.28.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Gobstones Blockly