diff --git a/HISTORY.md b/HISTORY.md index 3efe3b9b..b2ec2383 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -71,6 +71,7 @@ ### 2021-12-07 * objects: backwards-compatibility fix for key-event hat blocks +* store, objects: load category-less custom blocks into "other" ### 2021-12-06 * blocks, threads: refactored block assembly, experimental diff --git a/snap.html b/snap.html index ff977eed..44243560 100755 --- a/snap.html +++ b/snap.html @@ -30,7 +30,7 @@ - + diff --git a/src/store.js b/src/store.js index 41f5cb49..b99a169e 100644 --- a/src/store.js +++ b/src/store.js @@ -63,7 +63,7 @@ Project*/ // Global stuff //////////////////////////////////////////////////////// -modules.store = '2021-November-24'; +modules.store = '2021-December-07'; // XML_Serializer /////////////////////////////////////////////////////// /* @@ -971,6 +971,11 @@ SnapSerializer.prototype.loadCustomBlocks = function ( object ); definition.category = child.attributes.category || 'other'; + if (!SpriteMorph.prototype.allCategories().includes( + definition.category + )) { + definition.category = 'other'; + } definition.type = child.attributes.type || 'command'; definition.isHelper = (child.attributes.helper === 'true') || false; definition.isGlobal = (isGlobal === true); diff --git a/src/threads.js b/src/threads.js index 96d1ce49..adcba17c 100644 --- a/src/threads.js +++ b/src/threads.js @@ -64,7 +64,7 @@ SnapExtensions, AlignmentMorph, TextMorph, Cloud, HatBlockMorph*/ /*jshint esversion: 6*/ -modules.threads = '2021-December-06'; +modules.threads = '2021-December-07'; var ThreadManager; var Process; @@ -5670,7 +5670,7 @@ Process.prototype.reportGet = function (query) { ).map( def => def.blockInstance().reify() ).concat( - SpriteMorph.prototype.allCategories().reduce( + SpriteMorph.prototype.categories.reduce( (blocks, category) => blocks.concat( thisObj.getPrimitiveTemplates( category