tweaked loading mechanism to enable command blocks inside reporter rings

pull/89/head
jmoenig 2019-02-07 07:42:47 +01:00
rodzic b950976675
commit c081eb997f
3 zmienionych plików z 15 dodań i 5 usunięć

Wyświetl plik

@ -38,6 +38,9 @@
* Greek, thanks, Alexandros! * Greek, thanks, Alexandros!
* German * German
### 2019-02-07
* Store: tweaked loading mechanism to enable command blocks inside reporter rings
### 2019-02-06 ### 2019-02-06
* Blocks, BYOB: refactored custom block input options and drop-down menus * Blocks, BYOB: refactored custom block input options and drop-down menus
* Blocks: adjust bottom of STOP block to reflect the menu selection (show / hide bottom notch) * Blocks: adjust bottom of STOP block to reflect the menu selection (show / hide bottom notch)

Wyświetl plik

@ -17,7 +17,7 @@
<script type="text/javascript" src="src/symbols.js?version=2019-01-14"></script> <script type="text/javascript" src="src/symbols.js?version=2019-01-14"></script>
<script type="text/javascript" src="src/sketch.js?version=2018-10-02"></script> <script type="text/javascript" src="src/sketch.js?version=2018-10-02"></script>
<script type="text/javascript" src="src/xml.js?version=2018-11-12"></script> <script type="text/javascript" src="src/xml.js?version=2018-11-12"></script>
<script type="text/javascript" src="src/store.js?version=2019-01-23"></script> <script type="text/javascript" src="src/store.js?version=2019-02-07"></script>
<script type="text/javascript" src="src/locale.js?version=2019-01-28"></script> <script type="text/javascript" src="src/locale.js?version=2019-01-28"></script>
<script type="text/javascript" src="src/cloud.js?version=2019-01-25"></script> <script type="text/javascript" src="src/cloud.js?version=2019-01-25"></script>
<script type="text/javascript" src="src/sha512.js?version=2018-10-02"></script> <script type="text/javascript" src="src/sha512.js?version=2018-10-02"></script>

Wyświetl plik

@ -61,7 +61,7 @@ normalizeCanvas, contains*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.store = '2019-January-23'; modules.store = '2019-February-07';
// XML_Serializer /////////////////////////////////////////////////////// // XML_Serializer ///////////////////////////////////////////////////////
@ -1143,7 +1143,9 @@ SnapSerializer.prototype.loadBlock = function (model, isReporter, object) {
} }
*/ */
block = SpriteMorph.prototype.blockForSelector(model.attributes.s); block = SpriteMorph.prototype.blockForSelector(model.attributes.s);
migration = SpriteMorph.prototype.blockMigrations[model.attributes.s]; migration = SpriteMorph.prototype.blockMigrations[
model.attributes.s
];
if (migration) { if (migration) {
migrationOffset = migration.offset; migrationOffset = migration.offset;
} }
@ -1231,8 +1233,13 @@ SnapSerializer.prototype.loadInput = function (model, input, block, object) {
if (model.tag === 'script') { if (model.tag === 'script') {
inp = this.loadScript(model, object); inp = this.loadScript(model, object);
if (inp) { if (inp) {
input.add(inp); if (block.selector === 'reifyReporter') {
input.fixLayout(); input.silentReplaceInput(input.children[0], inp);
input.fixLayout();
} else {
input.add(inp);
input.fixLayout();
}
} }
} else if (model.tag === 'autolambda' && model.children[0]) { } else if (model.tag === 'autolambda' && model.children[0]) {
inp = this.loadBlock(model.children[0], true, object); inp = this.loadBlock(model.children[0], true, object);