load category-less custom blocks into "other"

snap7
jmoenig 2021-12-07 14:02:24 +01:00
rodzic d9c78e691e
commit d9d351687d
4 zmienionych plików z 10 dodań i 4 usunięć

Wyświetl plik

@ -71,6 +71,7 @@
### 2021-12-07 ### 2021-12-07
* objects: backwards-compatibility fix for key-event hat blocks * objects: backwards-compatibility fix for key-event hat blocks
* store, objects: load category-less custom blocks into "other"
### 2021-12-06 ### 2021-12-06
* blocks, threads: refactored block assembly, experimental * blocks, threads: refactored block assembly, experimental

Wyświetl plik

@ -30,7 +30,7 @@
<script src="src/maps.js?version=2021-06-15"></script> <script src="src/maps.js?version=2021-06-15"></script>
<script src="src/extensions.js?version=2021-11-22"></script> <script src="src/extensions.js?version=2021-11-22"></script>
<script src="src/xml.js?version=2021-07-05"></script> <script src="src/xml.js?version=2021-07-05"></script>
<script src="src/store.js?version=2021-11-24"></script> <script src="src/store.js?version=2021-12-07"></script>
<script src="src/locale.js?version=2021-12-06"></script> <script src="src/locale.js?version=2021-12-06"></script>
<script src="src/cloud.js?version=2021-02-04"></script> <script src="src/cloud.js?version=2021-02-04"></script>
<script src="src/api.js?version=2021-11-17"></script> <script src="src/api.js?version=2021-11-17"></script>

Wyświetl plik

@ -63,7 +63,7 @@ Project*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.store = '2021-November-24'; modules.store = '2021-December-07';
// XML_Serializer /////////////////////////////////////////////////////// // XML_Serializer ///////////////////////////////////////////////////////
/* /*
@ -971,6 +971,11 @@ SnapSerializer.prototype.loadCustomBlocks = function (
object object
); );
definition.category = child.attributes.category || 'other'; definition.category = child.attributes.category || 'other';
if (!SpriteMorph.prototype.allCategories().includes(
definition.category
)) {
definition.category = 'other';
}
definition.type = child.attributes.type || 'command'; definition.type = child.attributes.type || 'command';
definition.isHelper = (child.attributes.helper === 'true') || false; definition.isHelper = (child.attributes.helper === 'true') || false;
definition.isGlobal = (isGlobal === true); definition.isGlobal = (isGlobal === true);

Wyświetl plik

@ -64,7 +64,7 @@ SnapExtensions, AlignmentMorph, TextMorph, Cloud, HatBlockMorph*/
/*jshint esversion: 6*/ /*jshint esversion: 6*/
modules.threads = '2021-December-06'; modules.threads = '2021-December-07';
var ThreadManager; var ThreadManager;
var Process; var Process;
@ -5670,7 +5670,7 @@ Process.prototype.reportGet = function (query) {
).map( ).map(
def => def.blockInstance().reify() def => def.blockInstance().reify()
).concat( ).concat(
SpriteMorph.prototype.allCategories().reduce( SpriteMorph.prototype.categories.reduce(
(blocks, category) => blocks.concat( (blocks, category) => blocks.concat(
thisObj.getPrimitiveTemplates( thisObj.getPrimitiveTemplates(
category category