revert changes made for JSLint’s sake

after the issue was fixed in JSLint
pull/3/merge
jmoenig 2014-07-08 17:04:15 +02:00
rodzic 92c5c8bedf
commit cd416bc9a9
2 zmienionych plików z 6 dodań i 11 usunięć

Wyświetl plik

@ -2184,3 +2184,4 @@ ______
* GUI: show username in logout entry of cloud menu
* GUI, Objects: fixed scrolling glitch in the palette, thanks, Kunal!
* GUI, Objects: add keyboard shortcut for “new project”: ctr-n
* revert changes made for JSLints sake after the issue was fixed in JSLint

Wyświetl plik

@ -998,8 +998,6 @@ Process.prototype.evaluateCustomBlock = function () {
runnable,
extra,
i,
inp,
decs,
value,
upvars,
outer;
@ -1033,19 +1031,17 @@ Process.prototype.evaluateCustomBlock = function () {
if (!isNil(parms[i])) {
value = parms[i];
}
inp = context.inputs[i];
outer.variables.addVar(inp, value);
outer.variables.addVar(context.inputs[i], value);
// if the parameter is an upvar,
// create an UpvarReference to it
decs = declarations[inp];
if (decs[0] === '%upvar') {
if (declarations[context.inputs[i]][0] === '%upvar') {
if (!upvars) { // lazy initialization
upvars = new UpvarReference(this.context.upvars);
}
upvars.addReference(
value,
inp,
context.inputs[i],
outer.variables
);
}
@ -1063,7 +1059,6 @@ Process.prototype.evaluateCustomBlock = function () {
}
};
// Process variables primitives
Process.prototype.doDeclareVariables = function (varNames) {
@ -3162,9 +3157,8 @@ UpvarReference.prototype.find = function (name) {
};
UpvarReference.prototype.getVar = function (name) {
var tuple = this.vars[name],
varName = tuple[0],
varFrame = tuple[1],
var varName = this.vars[name][0],
varFrame = this.vars[name][1],
value = varFrame.vars[varName];
return (value === 0 ? 0 : value || 0); // don't return null
};