diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js index 9916a4925..e623b18f9 100644 --- a/core/renderers/common/constants.js +++ b/core/renderers/common/constants.js @@ -593,7 +593,7 @@ Blockly.blockRendering.ConstantProvider.prototype.getBlockStyle = function( Blockly.blockRendering.ConstantProvider.prototype.createBlockStyle_ = function( colour) { return this.validatedBlockStyle_({ - colourPrimary: colour + 'colourPrimary': colour }); }; @@ -619,7 +619,6 @@ Blockly.blockRendering.ConstantProvider.prototype.validatedBlockStyle_ = if (blockStyle) { Blockly.utils.object.mixin(valid, blockStyle); } - // Validate required properties. var parsedColour = Blockly.utils.parseBlockColour( valid['colourPrimary'] || '#000'); @@ -627,7 +626,7 @@ Blockly.blockRendering.ConstantProvider.prototype.validatedBlockStyle_ = valid.colourSecondary = valid['colourSecondary'] ? Blockly.utils.parseBlockColour(valid['colourSecondary']).hex : this.generateSecondaryColour_(valid.colourPrimary); - valid.colourTertiary = valid.colourTertiary ? + valid.colourTertiary = valid['colourTertiary'] ? Blockly.utils.parseBlockColour(valid['colourTertiary']).hex : this.generateTertiaryColour_(valid.colourPrimary); diff --git a/tests/compile/compile.sh b/tests/compile/compile.sh index 0f05f212f..b3251fc48 100755 --- a/tests/compile/compile.sh +++ b/tests/compile/compile.sh @@ -57,7 +57,7 @@ tempPath="$BLOCKLY_ROOT/temp_core" corePath="$BLOCKLY_ROOT/core/*" mkdir $tempPath cp $corePath $tempPath - +cp "$BLOCKLY_ROOT/tests/compile/test_blocks.js" "$tempPath/test_blocks.js" # Copy over all files in core and any subdirectories to the temp_core directory. for dir in "$corePath/" ; do # For all files in the directory and any subdirectories rename them to diff --git a/tests/compile/index.html b/tests/compile/index.html index eb067cee9..1ec1ce85a 100644 --- a/tests/compile/index.html +++ b/tests/compile/index.html @@ -38,6 +38,7 @@ + diff --git a/tests/compile/main.js b/tests/compile/main.js index d0c882114..3f0ec2235 100644 --- a/tests/compile/main.js +++ b/tests/compile/main.js @@ -31,6 +31,7 @@ goog.require('Blockly.Constants.Colour'); goog.require('Blockly.Constants.Variables'); goog.require('Blockly.Constants.VariablesDynamic'); goog.require('Blockly.Blocks.procedures'); +goog.require('Blockly.TestBlocks') Main.init = function() { Blockly.inject('blocklyDiv', {