Fix collision detection

KanoComputing · Jul 31, 2017 · 57bc7be · 57bc7be
1 parent 5f414ad
commit 57bc7be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/app/scripts/kano/make-apps/blockly/events.js b/app/scripts/kano/make-apps/blockly/events.js
@@ -69,21 +69,20 @@
                     this.setColour(COLOR);
                 },
                 getFirstPartOptions: function () {
-                    let options = Blockly.Blocks.collision_event.getParts()
-                        .map(this.formatPartOption);
+                    let parts = Blockly.Blocks.collision_event.getParts() || [],
+                        options = parts.map(this.formatPartOption);
 
                     if (!options.length) {
-                        options.push(['', 'null']);
+                        options.push(['No available part', '']);
                     }
 
                     return options;
                 },
                 getSecondPartOptions: function () {
-                    let options = Blockly.Blocks.collision_event.getParts()
-                        .filter(part => {
+                    let parts = Blockly.Blocks.collision_event.getParts() || [],
+                        options = parts.filter(part => {
                             return `parts.get('${part.id}')` !== this.getFieldValue('PART1');
-                        })
-                        .map(this.formatPartOption);
+                        }).map(this.formatPartOption);
 
                     // The @ here is to make sure no part id will collide with this name
                     options.push(['Top Edge', "'@top-edge'"]);
@@ -131,15 +130,15 @@
             let part1Id = block.getFieldValue('PART1'),
                 part2Id = block.getFieldValue('PART2'),
                 statement = Blockly.JavaScript.statementToCode(block, 'DO'),
-                code = `parts.whenCollisionBetween(${part1Id}, ${part2Id}, function () {\n${statement}});\n`;
+                code = `parts.whenCollisionBetween(${part1Id ? part1Id : null}, ${part2Id}, function () {\n${statement}});\n`;
             return code;
         };
 
         Blockly.Pseudo.collision_event = (block) => {
             let part1Id = block.getFieldValue('PART1'),
                 part2Id = block.getFieldValue('PART2'),
                 statement = Blockly.Pseudo.statementToCode(block, 'DO'),
-                code = `parts.whenCollisionBetween(${part1Id}, ${part2Id}, function () {\n${statement}});\n`;
+                code = `parts.whenCollisionBetween(${part1Id ? part1Id : null}, ${part2Id}, function () {\n${statement}});\n`;
             return code;
         };
 

diff --git a/app/scripts/kano/make-apps/blockly/logic.js b/app/scripts/kano/make-apps/blockly/logic.js
@@ -166,21 +166,20 @@
                 this.setColour(COLOR);
             },
             getFirstPartOptions: function () {
-                let options = Blockly.Blocks.collision_event.getParts()
-                    .map(this.formatPartOption);
+                let parts = Blockly.Blocks.collision_event.getParts() || [],
+                    options = parts.map(this.formatPartOption);
 
                 if (!options.length) {
-                    options.push(['No available part', null]);
+                    options.push(['No available part', '']);
                 }
 
                 return options;
             },
             getSecondPartOptions: function () {
-                let options = Blockly.Blocks.collision_event.getParts()
-                    .filter(part => {
+                let parts = Blockly.Blocks.collision_event.getParts() || [],
+                    options = parts.filter(part => {
                         return part.id !== this.getFieldValue('PART1');
-                    })
-                    .map(this.formatPartOption);
+                    }).map(this.formatPartOption);
 
                 // The @ here is to make sure no part id will collide with this name
                 options.push(['Top Edge', "'@top-edge'"]);
@@ -198,7 +197,7 @@
         Blockly.JavaScript.if_collides = (block) => {
             let part1Id = block.getFieldValue('PART1'),
                 part2Id = block.getFieldValue('PART2'),
-                code    = `parts.collisionBetween(${part1Id}, ${part2Id})`;
+                code    = `parts.collisionBetween(${part1Id ? part1Id : null}, ${part2Id})`;
             return [code];
         };