scratchfoundation/scratchblocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchblocks.git synced 2024-11-28 10:25:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

more fixes

Browse source
This commit is contained in:
tjvr 2016-07-14 23:19:32 +01:00
parent 5c67e30fdd
commit 8592e8e9fc
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/scratchblocks.js
View file

@ -1712,10 +1712,9 @@ var scratchblocks = function () {
}[part[1]]; }[part[1]];
if (shape === 'color') { if (shape === 'color') {
// a number is expected here if (!value && value !== 0) value = parseInt(Math.random() * 256 * 256 * 256);
value = parseInt(value); value = +value;
if (typeof(value) == "undefined" ) value = parseInt(Math.random() * 256 * 256 * 256); if (value < 0) value = 0xFFFFFFFF + value + 1;
if (value < 0) value = 0xFFFFFFFF + parseInt(value) + 1;
var hex = value.toString(16); var hex = value.toString(16);
hex = hex.slice(Math.max(0, hex.length - 6)); // last 6 characters hex = hex.slice(Math.max(0, hex.length - 6)); // last 6 characters
while (hex.length < 6) hex = '0' + hex; while (hex.length < 6) hex = '0' + hex;
@ -1723,8 +1722,6 @@ var scratchblocks = function () {
hex = hex[0] + hex[2] + hex[4]; hex = hex[0] + hex[2] + hex[4];
} }
value = '#' + hex; value = '#' + hex;
} else if (shape === 'number') {
value = parseInt(value);
} else if (shape === 'dropdown') { } else if (shape === 'dropdown') {
value = { value = {
_mouse_: "mouse-pointer", _mouse_: "mouse-pointer",
@ -1736,11 +1733,10 @@ var scratchblocks = function () {
var menu = value; var menu = value;
value = lang.dropdowns[value] || value ; value = lang.dropdowns[value] || value ;
} else if (shape === 'number-dropdown') { } else if (shape === 'number-dropdown') {
var menu = value;
value = lang.dropdowns[value] || value ; value = lang.dropdowns[value] || value ;
} }
return new Input(shape, value.toString(), menu); return new Input(shape, ''+value, menu);
}; };
Input.prototype.toJSON = function() { Input.prototype.toJSON = function() {