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

Make theme validate style method work with advanced compilation (#3384)

Browse Source
This commit is contained in:
Sam El-Husseini
2019-11-01 12:21:05 -07:00
committed by GitHub
parent 22c1eba546
commit 0aea33d8a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/theme.js
View File

@@ -170,18 +170,18 @@ Blockly.Theme.validatedBlockStyle = function(blockStyle) {
// Validate required properties.
var parsedColour = Blockly.utils.colour.parseBlockColour(
valid.colourPrimary || '#000');
valid['colourPrimary'] || '#000');
valid.colourPrimary = parsedColour.hex;
valid.colourSecondary = valid.colourSecondary ?
Blockly.utils.colour.parseBlockColour(valid.colourSecondary).hex :
valid.colourSecondary = valid['colourSecondary'] ?
Blockly.utils.colour.parseBlockColour(valid['colourSecondary']).hex :
Blockly.utils.colour.blend('#fff', valid.colourPrimary, 0.6) ||
valid.colourPrimary;
valid.colourTertiary = valid.colourTertiary ?
Blockly.utils.colour.parseBlockColour(valid.colourTertiary).hex :
Blockly.utils.colour.parseBlockColour(valid['colourTertiary']).hex :
Blockly.utils.colour.blend('#fff', valid.colourPrimary, 0.3) ||
valid.colourPrimary;
valid.hat = valid.hat || '';
valid.hat = valid['hat'] || '';
return valid;
};