diff --git a/core/block.js b/core/block.js index 99564e82e..d62c7249a 100644 --- a/core/block.js +++ b/core/block.js @@ -243,7 +243,7 @@ Blockly.Block.prototype.colour_ = '#000000'; * @type {?string} * @private */ -Blockly.Block.prototype.secondaryColour_ = null; +Blockly.Block.prototype.colourSecondary_ = null; /** * Tertiary colour of the block. @@ -251,7 +251,7 @@ Blockly.Block.prototype.secondaryColour_ = null; * @type {?string} * @private */ -Blockly.Block.prototype.tertiaryColour_ = null; +Blockly.Block.prototype.colourTertiary_ = null; /** * Name of the block style. @@ -859,16 +859,16 @@ Blockly.Block.prototype.getColour = function() { * Get the secondary colour of a block. * @return {?string} #RRGGBB string. */ -Blockly.Block.prototype.getSecondaryColour = function() { - return this.secondaryColour_; +Blockly.Block.prototype.getColourSecondary = function() { + return this.colourSecondary_; }; /** * Get the tertiary colour of a block. * @return {?string} #RRGGBB string. */ -Blockly.Block.prototype.getTertiaryColour = function() { - return this.tertiaryColour_; +Blockly.Block.prototype.getColourTertiary = function() { + return this.colourTertiary_; }; /** @@ -929,11 +929,11 @@ Blockly.Block.prototype.setStyle = function(blockStyleName) { this.styleName_ = blockStyleName; if (blockStyle) { - this.secondaryColour_ = blockStyle['secondaryColour']; - this.tertiaryColour_ = blockStyle['tertiaryColour']; + this.colourSecondary_ = blockStyle['colourSecondary']; + this.colourTertiary_ = blockStyle['colourTertiary']; this.hat = blockStyle.hat; // Set colour will trigger an updateColour() on a block_svg - this.setColour(blockStyle['primaryColour']); + this.setColour(blockStyle['colourPrimary']); } else { throw Error('Invalid style name: ' + blockStyleName); diff --git a/core/block_svg.js b/core/block_svg.js index 8df2dbf03..1bad283fd 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -935,14 +935,14 @@ Blockly.BlockSvg.prototype.updateColour = function() { return; } var hexColour = this.getColour(); - var secondaryColour = this.getSecondaryColour(); - var tertiaryColour = this.getTertiaryColour(); + var colourSecondary = this.getColourSecondary(); + var colourTertiary = this.getColourTertiary(); var rgb = goog.color.hexToRgb(hexColour); if (this.isShadow()) { - hexColour = this.setShadowColour_(rgb, secondaryColour); + hexColour = this.setShadowColour_(rgb, colourSecondary); } else { - this.setBorderColour_(rgb, tertiaryColour); + this.setBorderColour_(rgb, colourTertiary); } this.svgPath_.setAttribute('fill', hexColour); @@ -964,13 +964,13 @@ Blockly.BlockSvg.prototype.updateColour = function() { * Sets the colour of the border. * Removes the light and dark paths if a tertiary colour is defined. * @param {!string} rgb Colour of the block. - * @param {?string} tertiaryColour Colour of the border. + * @param {?string} colourTertiary Colour of the border. */ -Blockly.BlockSvg.prototype.setBorderColour_ = function(rgb, tertiaryColour) { - if (tertiaryColour) { +Blockly.BlockSvg.prototype.setBorderColour_ = function(rgb, colourTertiary) { + if (colourTertiary) { this.svgPathLight_.setAttribute('stroke', 'none'); this.svgPathDark_.setAttribute('fill', 'none'); - this.svgPath_.setAttribute('stroke', tertiaryColour); + this.svgPath_.setAttribute('stroke', colourTertiary); } else { this.svgPathLight_.style.display = ''; var hexLight = goog.color.rgbArrayToHex(goog.color.lighten(rgb, 0.3)); @@ -985,17 +985,17 @@ Blockly.BlockSvg.prototype.setBorderColour_ = function(rgb, tertiaryColour) { /** * Sets the colour of shadow blocks. * @param {!string} rgb Primary colour of the block. - * @param {?string} secondaryColour Colour for shadow block. + * @param {?string} colourSecondary Colour for shadow block. * @return {!string} hexColour The background color of the block. */ Blockly.BlockSvg.prototype.setShadowColour_ = function( - rgb, secondaryColour) { + rgb, colourSecondary) { var hexColour; - if (secondaryColour) { + if (colourSecondary) { this.svgPathLight_.style.display = 'none'; this.svgPathDark_.style.display = 'none'; - this.svgPath_.setAttribute('fill', secondaryColour); - hexColour = secondaryColour; + this.svgPath_.setAttribute('fill', colourSecondary); + hexColour = colourSecondary; } else { rgb = goog.color.lighten(rgb, 0.6); hexColour = goog.color.rgbArrayToHex(rgb); diff --git a/core/theme/classic.js b/core/theme/classic.js index c60ae4308..522e44440 100644 --- a/core/theme/classic.js +++ b/core/theme/classic.js @@ -31,34 +31,34 @@ goog.require('Blockly.Theme'); var defaultBlockStyles = { "colour_blocks":{ - "primaryColour": "20" + "colourPrimary": "20" }, "list_blocks": { - "primaryColour": "260" + "colourPrimary": "260" }, "logic_blocks": { - "primaryColour": "210" + "colourPrimary": "210" }, "loop_blocks": { - "primaryColour": "120" + "colourPrimary": "120" }, "math_blocks": { - "primaryColour": "230" + "colourPrimary": "230" }, "procedure_blocks": { - "primaryColour": "290" + "colourPrimary": "290" }, "text_blocks": { - "primaryColour": "160" + "colourPrimary": "160" }, "variable_blocks": { - "primaryColour": "330" + "colourPrimary": "330" }, "variable_dynamic_blocks":{ - "primaryColour": "310" + "colourPrimary": "310" }, "hat_blocks":{ - "primaryColour":"330", + "colourPrimary":"330", "hat":"cap" } }; diff --git a/core/theme/highcontrast.js b/core/theme/highcontrast.js index 4b294b759..93c88ecf9 100644 --- a/core/theme/highcontrast.js +++ b/core/theme/highcontrast.js @@ -30,54 +30,54 @@ goog.require('Blockly.Theme'); var defaultBlockStyles = { "colour_blocks":{ - "primaryColour": "#a52714", - "secondaryColour":"#FB9B8C", - "tertiaryColour":"#FBE1DD" + "colourPrimary": "#a52714", + "colourSecondary":"#FB9B8C", + "colourTertiary":"#FBE1DD" }, "list_blocks": { - "primaryColour": "#4a148c", - "secondaryColour":"#AD7BE9", - "tertiaryColour":"#CDB6E9" + "colourPrimary": "#4a148c", + "colourSecondary":"#AD7BE9", + "colourTertiary":"#CDB6E9" }, "logic_blocks": { - "primaryColour": "#01579b", - "secondaryColour":"#64C7FF", - "tertiaryColour":"#C5EAFF" + "colourPrimary": "#01579b", + "colourSecondary":"#64C7FF", + "colourTertiary":"#C5EAFF" }, "loop_blocks": { - "primaryColour": "#33691e", - "secondaryColour":"#9AFF78", - "tertiaryColour":"#E1FFD7" + "colourPrimary": "#33691e", + "colourSecondary":"#9AFF78", + "colourTertiary":"#E1FFD7" }, "math_blocks": { - "primaryColour": "#1a237e", - "secondaryColour":"#8A9EFF", - "tertiaryColour":"#DCE2FF" + "colourPrimary": "#1a237e", + "colourSecondary":"#8A9EFF", + "colourTertiary":"#DCE2FF" }, "procedure_blocks": { - "primaryColour": "#006064", - "secondaryColour":"#77E6EE", - "tertiaryColour":"#CFECEE" + "colourPrimary": "#006064", + "colourSecondary":"#77E6EE", + "colourTertiary":"#CFECEE" }, "text_blocks": { - "primaryColour": "#004d40", - "secondaryColour":"#5ae27c", - "tertiaryColour":"#D2FFDD" + "colourPrimary": "#004d40", + "colourSecondary":"#5ae27c", + "colourTertiary":"#D2FFDD" }, "variable_blocks": { - "primaryColour": "#880e4f", - "secondaryColour":"#FF73BE", - "tertiaryColour":"#FFD4EB" + "colourPrimary": "#880e4f", + "colourSecondary":"#FF73BE", + "colourTertiary":"#FFD4EB" }, "variable_dynamic_blocks": { - "primaryColour": "#880e4f", - "secondaryColour":"#FF73BE", - "tertiaryColour":"#FFD4EB" + "colourPrimary": "#880e4f", + "colourSecondary":"#FF73BE", + "colourTertiary":"#FFD4EB" }, "hat_blocks" : { - "primaryColour": "#880e4f", - "secondaryColour":"#FF73BE", - "tertiaryColour":"#FFD4EB", + "colourPrimary": "#880e4f", + "colourSecondary":"#FF73BE", + "colourTertiary":"#FFD4EB", "hat": "cap" } }; diff --git a/core/theme/modern.js b/core/theme/modern.js index e3614a5d3..d7e06cf1a 100644 --- a/core/theme/modern.js +++ b/core/theme/modern.js @@ -30,54 +30,54 @@ goog.require('Blockly.Theme'); var defaultBlockStyles = { "colour_blocks": { - "primaryColour": "#a5745b", - "secondaryColour": "#dbc7bd", - "tertiaryColour": "#845d49" + "colourPrimary": "#a5745b", + "colourSecondary": "#dbc7bd", + "colourTertiary": "#845d49" }, "list_blocks": { - "primaryColour": "#745ba5", - "secondaryColour": "#c7bddb", - "tertiaryColour": "#5d4984" + "colourPrimary": "#745ba5", + "colourSecondary": "#c7bddb", + "colourTertiary": "#5d4984" }, "logic_blocks": { - "primaryColour": "#5b80a5", - "secondaryColour": "#bdccdb", - "tertiaryColour": "#496684" + "colourPrimary": "#5b80a5", + "colourSecondary": "#bdccdb", + "colourTertiary": "#496684" }, "loop_blocks": { - "primaryColour": "#5ba55b", - "secondaryColour": "#bddbbd", - "tertiaryColour": "#498449" + "colourPrimary": "#5ba55b", + "colourSecondary": "#bddbbd", + "colourTertiary": "#498449" }, "math_blocks": { - "primaryColour": "#5b67a5", - "secondaryColour": "#bdc2db", - "tertiaryColour": "#495284" + "colourPrimary": "#5b67a5", + "colourSecondary": "#bdc2db", + "colourTertiary": "#495284" }, "procedure_blocks": { - "primaryColour": "#995ba5", - "secondaryColour": "#d6bddb", - "tertiaryColour": "#7a4984" + "colourPrimary": "#995ba5", + "colourSecondary": "#d6bddb", + "colourTertiary": "#7a4984" }, "text_blocks": { - "primaryColour": "#5ba58c", - "secondaryColour": "#bddbd1", - "tertiaryColour": "#498470" + "colourPrimary": "#5ba58c", + "colourSecondary": "#bddbd1", + "colourTertiary": "#498470" }, "variable_blocks": { - "primaryColour": "#a55b99", - "secondaryColour": "#dbbdd6", - "tertiaryColour": "#84497a" + "colourPrimary": "#a55b99", + "colourSecondary": "#dbbdd6", + "colourTertiary": "#84497a" }, "variable_dynamic_blocks": { - "primaryColour": "#a55b99", - "secondaryColour": "#dbbdd6", - "tertiaryColour": "#84497a" + "colourPrimary": "#a55b99", + "colourSecondary": "#dbbdd6", + "colourTertiary": "#84497a" }, "hat_blocks": { - "primaryColour": "#a55b99", - "secondaryColour": "#dbbdd6", - "tertiaryColour": "#84497a", + "colourPrimary": "#a55b99", + "colourSecondary": "#dbbdd6", + "colourTertiary": "#84497a", "hat": "cap" } }; diff --git a/tests/jsunit/block_test.js b/tests/jsunit/block_test.js index 28d85281c..6a802258f 100644 --- a/tests/jsunit/block_test.js +++ b/tests/jsunit/block_test.js @@ -264,9 +264,9 @@ function test_set_style() { var styleStub = { getBlockStyle: function() { return{ - "primaryColour": "#FFFFFF", - "secondaryColour":"#AABBCC", - "tertiaryColour":"#DDEEFF" + "colourPrimary": "#FFFFFF", + "colourSecondary":"#AABBCC", + "colourTertiary":"#DDEEFF" } } }; @@ -275,8 +275,8 @@ function test_set_style() { blockA.setStyle('styleOne'); assertEquals(blockA.colour_, '#FFFFFF'); - assertEquals(blockA.secondaryColour_, '#AABBCC'); - assertEquals(blockA.tertiaryColour_, '#DDEEFF'); + assertEquals(blockA.colourSecondary_, '#AABBCC'); + assertEquals(blockA.colourTertiary_, '#DDEEFF'); blockTest_tearDown(); } diff --git a/tests/jsunit/theme_test.js b/tests/jsunit/theme_test.js index 782b8be90..1942b8444 100644 --- a/tests/jsunit/theme_test.js +++ b/tests/jsunit/theme_test.js @@ -53,9 +53,9 @@ function undefineThemeTestBlocks() { function createBlockStyles() { return { "styleOne": { - "primaryColour": "colour1", - "secondaryColour":"colour2", - "tertiaryColour":"colour3" + "colourPrimary": "colour1", + "colourSecondary":"colour2", + "colourTertiary":"colour3" } }; } @@ -63,14 +63,14 @@ function createBlockStyles() { function createMultipleBlockStyles() { return { "styleOne": { - "primaryColour": "colour1", - "secondaryColour":"colour2", - "tertiaryColour":"colour3" + "colourPrimary": "colour1", + "colourSecondary":"colour2", + "colourTertiary":"colour3" }, "styleTwo": { - "primaryColour": "colour1", - "secondaryColour":"colour2", - "tertiaryColour":"colour3" + "colourPrimary": "colour1", + "colourSecondary":"colour2", + "colourTertiary":"colour3" } }; } @@ -99,7 +99,7 @@ function test_getBlockStyles() { function test_setBlockStyleUpdate() { var theme = new Blockly.Theme(createBlockStyles()); var blockStyle = createBlockStyles(); - blockStyle.styleOne.primaryColour = 'somethingElse'; + blockStyle.styleOne.colourPrimary = 'somethingElse'; theme.setBlockStyle('styleOne', blockStyle.styleOne); diff --git a/theme_scripts/create_blockStyles.py b/theme_scripts/create_blockStyles.py index 2ae374cf8..74fde65b1 100644 --- a/theme_scripts/create_blockStyles.py +++ b/theme_scripts/create_blockStyles.py @@ -32,9 +32,9 @@ # Output: A json file with the keys being style names and the values being an # object holding primary, secondary, and tertiary colours in hex format. # {"styleName": -# {"primaryColour":"hexVal", -# "secondaryColour":"hexVal", -# "tertiaryColour":"hexVal" +# {"colourPrimary":"hexVal", +# "colourSecondary":"hexVal", +# "colourTertiary":"hexVal" # } # } @@ -127,13 +127,13 @@ def rgbToHex(rgb): #Calculates the primary, secondary and tertiary colours for the block style def findOtherColours(rgb): - primaryColour = rgbToHex(rgb) - secondaryColour = rgbToHex(lighten(rgb, LIGHT_FACTOR)) - tertiaryColour = rgbToHex(darken(rgb, DARK_FACTOR)) + colourPrimary = rgbToHex(rgb) + colourSecondary = rgbToHex(lighten(rgb, LIGHT_FACTOR)) + colourTertiary = rgbToHex(darken(rgb, DARK_FACTOR)) return { - "primaryColour": primaryColour, - "secondaryColour": secondaryColour, - "tertiaryColour": tertiaryColour + "colourPrimary": colourPrimary, + "colourSecondary": colourSecondary, + "colourTertiary": colourTertiary } # Converts a hex colour to rgb colour format @@ -167,7 +167,7 @@ def getFileInfo(): return (jsonFile, fileName) # Creates a map with the keys being the style names and the values being an object -# holding primaryColour, secondaryColour, tertiaryColour +# holding colourPrimary, colourSecondary, colourTertiary def createColourMap(): (jsonFile, fileName) = getFileInfo() jsonData = json.loads(jsonFile)