CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-09 18:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid colours in Block Factory.

Browse Source
This commit is contained in:
Neil Fraser
2016-02-26 21:20:39 -08:00
parent b567d6b0d7
commit a22b936229
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
demos/blockfactory/blocks.js
View File

@@ -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');

4
demos/blockfactory/factory.js
View File

@@ -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/');");