Merge pull request #21 from Nestor94Gonzalez/new-build

Fixed block id encoding issue & changed find path block color to match Erle-Brain category
erlerobot · Apr 20, 2016 · a0d8914 · a0d8914
2 parents 7650c6c + 0103e05
commit a0d8914
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/blocks/erle-brain.js b/blocks/erle-brain.js
@@ -156,7 +156,7 @@ Blockly.Blocks['find_path'] = {
         .appendField("Find path");
     this.setPreviousStatement(true);
     this.setNextStatement(true);
-    this.setColour(260);
+    this.setColour(0);
     this.setTooltip('');
     this.setHelpUrl('http://erlerobotics.com/docs/Robot_Operating_System/ROS/Blockly/Intro.html');
   }

diff --git a/blocks_compressed.js b/blocks_compressed.js
diff --git a/core/generator.js b/core/generator.js
@@ -168,8 +168,10 @@ Blockly.Generator.prototype.blockToCode = function(block) {
     return [this.scrub_(block, code[0]), code[1]];
   } else if (goog.isString(code)) {
     if (this.STATEMENT_PREFIX) {
-      code = this.STATEMENT_PREFIX.replace(/%1/g, '\'' + block.id + '\'') +
-          code;
+      // Escaping all $ signs by $$ for replace function
+      var regexp_ready_block_id = block.id.replace(/\$/g, "$$$$");
+      code = this.STATEMENT_PREFIX.replace(/%1/g,
+          '\'' + regexp_ready_block_id + '\'') + code;
     }
     return this.scrub_(block, code);
   } else if (code === null) {
@@ -257,12 +259,15 @@ Blockly.Generator.prototype.statementToCode = function(block, name) {
  * @return {string} Loop contents, with infinite loop trap added.
  */
 Blockly.Generator.prototype.addLoopTrap = function(branch, id) {
+  // Escaping all $ signs by $$ for replace function
+  var regexp_ready_block_id = id.replace(/\$/g, "$$$$");
   if (this.INFINITE_LOOP_TRAP) {
-    branch = this.INFINITE_LOOP_TRAP.replace(/%1/g, '\'' + id + '\'') + branch;
+    branch = this.INFINITE_LOOP_TRAP.replace(/%1/g,
+        '\'' + regexp_ready_block_id + '\'') + branch;
   }
   if (this.STATEMENT_PREFIX) {
     branch += this.prefixLines(this.STATEMENT_PREFIX.replace(/%1/g,
-        '\'' + id + '\''), this.INDENT);
+        '\'' + regexp_ready_block_id + '\''), this.INDENT);
   }
   return branch;
 };

diff --git a/generators/python/procedures.js b/generators/python/procedures.js
@@ -48,14 +48,16 @@ Blockly.Python['procedures_defreturn'] = function(block) {
   var funcName = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'),
       Blockly.Procedures.NAME_TYPE);
   var branch = Blockly.Python.statementToCode(block, 'STACK');
+  // Escaping all $ signs by $$ for replace function
+  var regexp_ready_block_id = block.id.replace(/\$/g, "$$$$");
   if (Blockly.Python.STATEMENT_PREFIX) {
     branch = Blockly.Python.prefixLines(
         Blockly.Python.STATEMENT_PREFIX.replace(/%1/g,
-        '\'' + block.id + '\''), Blockly.Python.INDENT) + branch;
+        '\'' + regexp_ready_block_id + '\''), Blockly.Python.INDENT) + branch;
   }
   if (Blockly.Python.INFINITE_LOOP_TRAP) {
     branch = Blockly.Python.INFINITE_LOOP_TRAP.replace(/%1/g,
-        '"' + block.id + '"') + branch;
+        '"' + regexp_ready_block_id + '"') + branch;
   }
   var returnValue = Blockly.Python.valueToCode(block, 'RETURN',
       Blockly.Python.ORDER_NONE) || '';

diff --git a/python_compressed.js b/python_compressed.js