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

Making all blocks use the MSG colour values. (#1749)

Browse Source 
* Making all blocks use the MSG colour values.
 * Deprecating Blockly.Constants.Lists.HUE and similar constants.
 * Removing deprecated Blockly.Blocks.lists.HUE constants.
 * Allowing message references in the Block.setColour() parameter.
 * Adding checking of older constants, ensuring they are not overwritten.
This commit is contained in:
Andrew n marshall
2018-04-09 17:37:47 -07:00
committed by GitHub
parent d3a9d96841
commit e9d8e00a55
12 changed files with 134 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/block.js
View File

@@ -657,19 +657,28 @@ Blockly.Block.prototype.getHue = function() {
/**
* Change the colour of a block.
* @param {number|string} colour HSV hue value, or #RRGGBB string.
* @param {number|string} colour HSV hue value (0 to 360), #RRGGBB string,
* or a message reference string pointing to one of those two values.
*/
Blockly.Block.prototype.setColour = function(colour) {
var hue = Number(colour);
var dereferenced = goog.isString(colour) ?
Blockly.utils.replaceMessageReferences(colour) : colour;
var hue = Number(dereferenced);
if (!isNaN(hue) && 0 <= hue && hue <= 360) {
this.hue_ = hue;
this.colour_ = Blockly.hueToRgb(hue);
} else if (goog.isString(colour) && /^#[0-9a-fA-F]{6}$/.test(colour)) {
this.colour_ = colour;
} else if (goog.isString(dereferenced) &&
/^#[0-9a-fA-F]{6}$/.test(dereferenced)) {
this.colour_ = dereferenced;
// Only store hue if colour is set as a hue.
this.hue_ = null;
} else {
throw 'Invalid colour: ' + colour;
var errorMsg = 'Invalid colour: "' + dereferenced + '"';
if (colour != dereferenced) {
errorMsg += ' (from "' + colour + '")';
}
throw errorMsg;
}
};
@@ -1067,9 +1076,7 @@ Blockly.Block.prototype.jsonInit = function(json) {
if (json['colour'] !== undefined) {
var rawValue = json['colour'];
try {
var colour = goog.isString(rawValue) ?
Blockly.utils.replaceMessageReferences(rawValue) : rawValue;
this.setColour(colour);
this.setColour(rawValue);
} catch (colorError) {
console.warn(
'Block "' + blockTypeName + '": Illegal color value: ', rawValue);