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

Adds ability to provide a hue value for primary colour

Browse Source
This commit is contained in:
alschmiedt
2018-12-12 11:39:23 -08:00
parent fbd44c80f9
commit 4918da9538
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/block.js
View File

@@ -938,7 +938,7 @@ Blockly.Block.prototype.setStyle = function(blockStyleName) {
if (blockStyle) {
this.style_ = blockStyle;
this.colour_ = blockStyle.primaryColour;
this.setColour(blockStyle.primaryColour);
this.secondaryColour_ = blockStyle.secondaryColour;
this.tertiaryColour_ = blockStyle.tertiaryColour;
}

8
tests/jsunit/style_test.js
View File

@@ -120,17 +120,15 @@ function test_setStyleForBlockly() {
var blockStyles = createBlockStyles();
var workspace = new Blockly.WorkspaceSvg({});
var blockA = workspace.newBlock('stack_block');
var blocks;
var blocks = [blockA];
blockA.setStyle = function(){this.styleName_ = 'styleTwo'};
var something = 1;
var callCount = 1;
workspace.refreshToolboxSelection = function(){
return ++something;
return ++callCount;
};
blockA.styleName_ = 'styleOne';
blocks = [blockA];
setUpMockMethod(mockControl_, Blockly, 'getMainWorkspace', null, [workspace]);
Blockly.setStyle(blockStyles);