gobstones-blockly 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a85dadb56aeedaf4405884ad24dedc8145d62b9665be27b3bb0bc6518010a06
-  data.tar.gz: ba06f79a4e592c519a01813a56f04ac2cb4a6f672feef76913a069481245f3ea
+  metadata.gz: a5ce31882d527f3ac925264c5e88f37eb18f15ddbd66f1f0e2f55700e344b78a
+  data.tar.gz: 1ddacf0a781f3b21fe9b52ae430ba4e029fa5ae6baefcfc877239d7e1fa6baa9
 SHA512:
-  metadata.gz: ef4884a64413fac463154ebeacccca243373dbe74e1f9ff47e6bcdb31c27fe26e617c60e2ed6701274cc7916dcb2dee3532d0c028ce751b6b2419df932c4571d
-  data.tar.gz: 4a3366db0bff260ab3fd41946033dae0847a766c16460bd32892eb0d577ace4957211d8f5eb49ee14a7deb0bad783420773daee51d24acd2bec22cf4a064f203
+  metadata.gz: 06b682643c09d71b04dd289da591e7e2702ad179925de0bb1f96444e625b791d34b9ef3207557398cb959b03903ad0c77086b8132a990582dcdbbc927f62fed9
+  data.tar.gz: ab939e861a409770e85008e4e0066f7daeadbc711a896ebb025f29f4506be20638479ea5d9be1d7f61e92c9443c3a2977b71131d1472272769d7a2c458d579ab

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

@@ -5659,6 +5659,9 @@ Blockly.ErrorInforming.CssContent = [
 ];</script>
   
   <script>
+    const BLOCKLY_PRIMITIVE_PROCEDURES = "Procedimientos primitivos";
+    const BLOCKLY_PRIMITIVE_FUNCTIONS = "Funciones primitivas";
+
     Polymer({
       is: 'gs-element-blockly',
 
@@ -5745,6 +5748,14 @@ Blockly.ErrorInforming.CssContent = [
           type: String,
           value: "../bower_components/blockly-package/media/"
         },
+
+        /*
+         * `readOnly` Use blockly in readOnly mode.
+         */
+        readOnly: {
+            type: Boolean,
+            value: false
+        },
       },
 
       _onPrimitiveProceduresChange: function() {
@@ -5797,13 +5808,12 @@ Blockly.ErrorInforming.CssContent = [
       /**
        * Retorna el arbol por defecto de bloques y categorias
        */
-      _defaultToolboxTree : function() {
+      _defaultToolboxTree : function(toolboxXML) {
         const primitiveProcedures = this._getPrimitiveNames(this.primitiveProcedures);
         const primitiveFunctions = this._getPrimitiveNames(this.primitiveFunctions);
 
         let tree = []
-        let toolboxDefault = this.$$('#toolbox');
-        let toolboxDefaultLines = toolboxDefault.innerHTML.split("\n");
+        let toolboxDefaultLines = (toolboxXML || this.$$('#toolbox').innerHTML).split("\n");
         let ignore_last = false;
         let parent = tree;
         let stack = [];
@@ -5821,9 +5831,9 @@ Blockly.ErrorInforming.CssContent = [
           else if(line.indexOf('<category') >= 0) {
             let m = line.match('name="([^"]*)"')
             if(m.length == 2 && (
-              (m[1] == 'Procedimientos primitivos' && primitiveProcedures && primitiveProcedures.length > 0) ||
-              (m[1] == 'Funciones primitivas' && primitiveFunctions && primitiveFunctions.length > 0) ||
-              (m[1] != 'Procedimientos primitivos' && m[1] != 'Funciones primitivas'))) {
+              (m[1] == BLOCKLY_PRIMITIVE_PROCEDURES && primitiveProcedures && primitiveProcedures.length > 0) ||
+              (m[1] == BLOCKLY_PRIMITIVE_FUNCTIONS && primitiveFunctions && primitiveFunctions.length > 0) ||
+              (m[1] != BLOCKLY_PRIMITIVE_PROCEDURES && m[1] != BLOCKLY_PRIMITIVE_FUNCTIONS))) {
               parent.push({
                 type: 'category',
                 name: m[1],
@@ -5832,7 +5842,7 @@ Blockly.ErrorInforming.CssContent = [
               });
               stack.push(parent);
               parent = parent[parent.length - 1].child;
-              if(m[1] == 'Procedimientos primitivos')
+              if(m[1] == BLOCKLY_PRIMITIVE_PROCEDURES)
               {
                 for(var i in primitiveProcedures) {
                   parent.push({
@@ -5841,7 +5851,7 @@ Blockly.ErrorInforming.CssContent = [
                   });
                 }
               }
-              if(m[1] == 'Funciones primitivas')
+              if(m[1] == BLOCKLY_PRIMITIVE_FUNCTIONS)
               {
                 for(var i in primitiveFunctions) {
                   parent.push({
@@ -5891,7 +5901,7 @@ Blockly.ErrorInforming.CssContent = [
         let tree = this._defaultToolboxTree();
         let toolbox = [];
 
-        if(this.toolbox) {
+        if (this.toolbox) {
           let visibles = this._homogenizeIDs(this.toolbox.visible);
           let disabled = this._homogenizeIDs(this.toolbox.disabled);
           if(visibles.length > 0) {
@@ -5936,8 +5946,28 @@ Blockly.ErrorInforming.CssContent = [
           }
           marcarDisabled(toolbox);
 
-        }
-        else {
+          const addCustomActions = (type, categoryName) => {
+            if (this.toolbox[type]) {
+              const customTree = this._defaultToolboxTree(this.toolbox[type]);
+
+              const addCustomActionsChilds = (ttree) => {
+                for (var item of ttree) {
+                  if (item.type !== "category") continue;
+
+                  if (item.name === BLOCKLY_PRIMITIVE_PROCEDURES)
+                    item.child = customTree;
+                  else
+                    addCustomActionsChilds(item.child);
+                }
+              };
+
+              addCustomActionsChilds(toolbox);
+            }
+          };
+
+          addCustomActions("primitiveProcedures", BLOCKLY_PRIMITIVE_PROCEDURES);
+          addCustomActions("primitiveFunctions", BLOCKLY_PRIMITIVE_FUNCTIONS);
+        } else {
           toolbox = tree;
         }
 
@@ -6329,6 +6359,7 @@ Blockly.ErrorInforming.CssContent = [
           horizontalLayout: false,
           collapse: true,
           css: true,
+          readOnly: this.readOnly,
           zoom: {
             controls: true,
             wheel: true

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.10.3"
+    VERSION = "0.11.0"
   end
 end

metadata

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