Merge pull request #1523 from dpvc/issue1468
Don't copy environment into array environments. #1468
This commit is contained in:
commit
cb7314d9e8
|
@ -53,8 +53,10 @@
|
||||||
else if (top) {
|
else if (top) {
|
||||||
this.data.push(item);
|
this.data.push(item);
|
||||||
if (item.env) {
|
if (item.env) {
|
||||||
for (var id in this.env)
|
if (item.copyEnv !== false) {
|
||||||
{if (this.env.hasOwnProperty(id)) {item.env[id] = this.env[id]}}
|
for (var id in this.env)
|
||||||
|
{if (this.env.hasOwnProperty(id)) {item.env[id] = this.env[id]}}
|
||||||
|
}
|
||||||
this.env = item.env;
|
this.env = item.env;
|
||||||
} else {item.env = this.env}
|
} else {item.env = this.env}
|
||||||
}
|
}
|
||||||
|
@ -256,9 +258,9 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
STACKITEM.array = STACKITEM.Subclass({
|
STACKITEM.array = STACKITEM.Subclass({
|
||||||
type: "array", isOpen: true, arraydef: {},
|
type: "array", isOpen: true, copyEnv: false, arraydef: {},
|
||||||
Init: function () {
|
Init: function () {
|
||||||
this.table = []; this.row = []; this.env = {}; this.frame = []; this.hfill = [];
|
this.table = []; this.row = []; this.frame = []; this.hfill = [];
|
||||||
this.SUPER(arguments).Init.apply(this,arguments);
|
this.SUPER(arguments).Init.apply(this,arguments);
|
||||||
},
|
},
|
||||||
checkItem: function (item) {
|
checkItem: function (item) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user