From a22b936229de7e295abde01644e058b145e0c1ec Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Fri, 26 Feb 2016 21:20:39 -0800 Subject: [PATCH] Fix invalid colours in Block Factory. --- demos/blockfactory/blocks.js | 5 ++++- demos/blockfactory/factory.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/demos/blockfactory/blocks.js b/demos/blockfactory/blocks.js index 52172f5db..3a3101956 100644 --- a/demos/blockfactory/blocks.js +++ b/demos/blockfactory/blocks.js @@ -696,7 +696,10 @@ Blockly.Blocks['colour_hue'] = { }, validator: function(text) { // Update the current block's colour to match. - this.sourceBlock_.setColour(text); + var hue = parseInt(text, 10); + if (!isNaN(hue)) { + this.sourceBlock_.setColour(hue); + } }, mutationToDom: function(workspace) { var container = document.createElement('mutation'); diff --git a/demos/blockfactory/factory.js b/demos/blockfactory/factory.js index 6182a5b26..c8dc2e0ba 100644 --- a/demos/blockfactory/factory.js +++ b/demos/blockfactory/factory.js @@ -258,7 +258,9 @@ function formatJavaScript_(blockType, rootBlock) { var colourBlock = rootBlock.getInputTargetBlock('COLOUR'); if (colourBlock && !colourBlock.disabled) { var hue = parseInt(colourBlock.getFieldValue('HUE'), 10); - code.push(' this.setColour(' + hue + ');'); + if (!isNaN(hue)) { + code.push(' this.setColour(' + hue + ');'); + } } code.push(" this.setTooltip('');"); code.push(" this.setHelpUrl('http://www.example.com/');");