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: show username in logout entry of cloud menu
* GUI, Objects: fixed scrolling glitch in the palette, thanks, Kunal! * GUI, Objects: fixed scrolling glitch in the palette, thanks, Kunal!
* GUI, Objects: add keyboard shortcut for “new project”: ctr-n * 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, runnable,
extra, extra,
i, i,
inp,
decs,
value, value,
upvars, upvars,
outer; outer;
@ -1033,19 +1031,17 @@ Process.prototype.evaluateCustomBlock = function () {
if (!isNil(parms[i])) { if (!isNil(parms[i])) {
value = parms[i]; value = parms[i];
} }
inp = context.inputs[i]; outer.variables.addVar(context.inputs[i], value);
outer.variables.addVar(inp, value);
// if the parameter is an upvar, // if the parameter is an upvar,
// create an UpvarReference to it // create an UpvarReference to it
decs = declarations[inp]; if (declarations[context.inputs[i]][0] === '%upvar') {
if (decs[0] === '%upvar') {
if (!upvars) { // lazy initialization if (!upvars) { // lazy initialization
upvars = new UpvarReference(this.context.upvars); upvars = new UpvarReference(this.context.upvars);
} }
upvars.addReference( upvars.addReference(
value, value,
inp, context.inputs[i],
outer.variables outer.variables
); );
} }
@ -1063,7 +1059,6 @@ Process.prototype.evaluateCustomBlock = function () {
} }
}; };
// Process variables primitives // Process variables primitives
Process.prototype.doDeclareVariables = function (varNames) { Process.prototype.doDeclareVariables = function (varNames) {
@ -3162,9 +3157,8 @@ UpvarReference.prototype.find = function (name) {
}; };
UpvarReference.prototype.getVar = function (name) { UpvarReference.prototype.getVar = function (name) {
var tuple = this.vars[name], var varName = this.vars[name][0],
varName = tuple[0], varFrame = this.vars[name][1],
varFrame = tuple[1],
value = varFrame.vars[varName]; value = varFrame.vars[varName];
return (value === 0 ? 0 : value || 0); // don't return null return (value === 0 ? 0 : value || 0); // don't return null
}; };