kopia lustrzana https://github.com/backface/turtlestitch
removed scaffolding in store.js
rodzic
a94b54784d
commit
c7f8204bf3
|
@ -18,6 +18,7 @@
|
||||||
* objects: adapted formula editor for variadic infix reporters
|
* objects: adapted formula editor for variadic infix reporters
|
||||||
* objects: removed scaffolding
|
* objects: removed scaffolding
|
||||||
* store: apply block migration dictionary to hidden blocks in microworlds
|
* store: apply block migration dictionary to hidden blocks in microworlds
|
||||||
|
* store: removed scaffolding
|
||||||
|
|
||||||
### 2022-02-28
|
### 2022-02-28
|
||||||
* blocks, objects, threads, store: made addition reporter variadic
|
* blocks, objects, threads, store: made addition reporter variadic
|
||||||
|
|
20
src/store.js
20
src/store.js
|
@ -1193,7 +1193,7 @@ SnapSerializer.prototype.loadBlock = function (model, isReporter, object) {
|
||||||
// private
|
// private
|
||||||
var block, info, inputs, isGlobal, receiver, migration,
|
var block, info, inputs, isGlobal, receiver, migration,
|
||||||
migrationOffset = 0,
|
migrationOffset = 0,
|
||||||
migratoToVariadic = false; // +++
|
migratoToVariadic = false;
|
||||||
|
|
||||||
if (model.tag === 'block') {
|
if (model.tag === 'block') {
|
||||||
if (Object.prototype.hasOwnProperty.call(
|
if (Object.prototype.hasOwnProperty.call(
|
||||||
|
@ -1210,7 +1210,7 @@ SnapSerializer.prototype.loadBlock = function (model, isReporter, object) {
|
||||||
];
|
];
|
||||||
if (migration) {
|
if (migration) {
|
||||||
migrationOffset = migration.offset || 0;
|
migrationOffset = migration.offset || 0;
|
||||||
migratoToVariadic = migration.variadic; // +++
|
migratoToVariadic = migration.variadic;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (model.tag === 'custom-block') {
|
} else if (model.tag === 'custom-block') {
|
||||||
|
@ -1270,13 +1270,23 @@ SnapSerializer.prototype.loadBlock = function (model, isReporter, object) {
|
||||||
} else if (child.tag === 'receiver') {
|
} else if (child.tag === 'receiver') {
|
||||||
nop(); // ignore
|
nop(); // ignore
|
||||||
} else {
|
} else {
|
||||||
if (migratoToVariadic) { // +++
|
if (migratoToVariadic) {
|
||||||
// assume all formerly single inputs are now part of the first
|
// assume all formerly single inputs are now part of the first
|
||||||
// one which is variadic and already expanded to hold them
|
// one which is variadic and already expanded to hold them
|
||||||
// example: migrate old infix addition to new variadic infix sum
|
// example: migrate old infix addition to new variadic infix sum
|
||||||
this.loadInput(child, inputs[0].inputs()[i], inputs[0], object); // +++
|
this.loadInput(
|
||||||
|
child,
|
||||||
|
inputs[0].inputs()[i],
|
||||||
|
inputs[0],
|
||||||
|
object
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
this.loadInput(child, inputs[i + migrationOffset], block, object); // +++
|
this.loadInput(
|
||||||
|
child,
|
||||||
|
inputs[i + migrationOffset],
|
||||||
|
block,
|
||||||
|
object
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Ładowanie…
Reference in New Issue