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

Rename localValue -> value

Browse source
This commit is contained in:
tjvr 2016-07-14 22:58:08 +01:00
parent e0a268a71c
commit 5c67e30fdd
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/scratchblocks.js
View file

@ -1700,7 +1700,8 @@ var scratchblocks = function () {
this.x = 0; this.x = 0;
}; };
Input.prototype.isInput = true; Input.prototype.isInput = true;
Input.fromJSON = function(lang, value, part) {
Input.fromJSON = function(lang, value, part) {
var shape = { var shape = {
b: 'boolean', b: 'boolean',
n: 'number', n: 'number',
@ -1710,37 +1711,36 @@ Input.fromJSON = function(lang, value, part) {
c: 'color', c: 'color',
}[part[1]]; }[part[1]];
var localValue = value;
if (shape === 'color') { if (shape === 'color') {
// a number is expected here // a number is expected here
localValue = parseInt(localValue); value = parseInt(value);
if (typeof(localValue) == "undefined" ) localValue = parseInt(Math.random() * 256 * 256 * 256); if (typeof(value) == "undefined" ) value = parseInt(Math.random() * 256 * 256 * 256);
if (localValue < 0) localValue = 0xFFFFFFFF + parseInt(localValue) + 1; if (value < 0) value = 0xFFFFFFFF + parseInt(value) + 1;
var hex = localValue.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;
if (hex[0] === hex[1] && hex[2] === hex[3] && hex[4] === hex[5]) { if (hex[0] === hex[1] && hex[2] === hex[3] && hex[4] === hex[5]) {
hex = hex[0] + hex[2] + hex[4]; hex = hex[0] + hex[2] + hex[4];
} }
localValue = '#' + hex; value = '#' + hex;
} else if (shape === 'number') { } else if (shape === 'number') {
localValue = parseInt(localValue); value = parseInt(value);
} else if (shape === 'dropdown') { } else if (shape === 'dropdown') {
localValue = { value = {
_mouse_: "mouse-pointer", _mouse_: "mouse-pointer",
_myself_: "myself", _myself_: "myself",
_stage_: "Stage", _stage_: "Stage",
_edge_: "edge", _edge_: "edge",
_random_: "random position", _random_: "random position",
}[localValue] || localValue; }[value] || value;
var menu = localValue; var menu = value;
localValue = lang.dropdowns[localValue] || localValue ; value = lang.dropdowns[value] || value ;
} else if (shape === 'number-dropdown') { } else if (shape === 'number-dropdown') {
var menu = localValue; var menu = value;
localValue = lang.dropdowns[localValue] || localValue ; value = lang.dropdowns[value] || value ;
} }
return new Input(shape, localValue.toString(), menu); return new Input(shape, value.toString(), menu);
}; };
Input.prototype.toJSON = function() { Input.prototype.toJSON = function() {