diff --git a/src/app/effects/blockly-editor.effects.ts b/src/app/effects/blockly-editor.effects.ts index f55a8e50..14156925 100644 --- a/src/app/effects/blockly-editor.effects.ts +++ b/src/app/effects/blockly-editor.effects.ts @@ -133,11 +133,11 @@ export class BlocklyEditorEffects { const toolboxElement = toolboxXmlDoc.getElementById('easyBloqsToolbox'); const leaphyCategories = parser.parseFromString(leaphyToolboxXml, 'text/xml'); const leaphyRobotCategory = leaphyCategories.getElementById(robotType.id); - toolboxElement.prepend(leaphyRobotCategory); if (robotType.showLeaphyExtra) { const leaphyExtraCategory = leaphyCategories.getElementById(`${robotType.id}_extra`); - toolboxElement.appendChild(leaphyExtraCategory); + toolboxElement.prepend(leaphyExtraCategory); } + toolboxElement.prepend(leaphyRobotCategory); const serializer = new XMLSerializer(); const toolboxXmlString = serializer.serializeToString(toolboxXmlDoc); config.toolbox = toolboxXmlString; diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml index 10d311b8..24cb0f33 100644 --- a/src/assets/blockly/leaphy-toolbox.xml +++ b/src/assets/blockly/leaphy-toolbox.xml @@ -1,90 +1,22 @@ - - - - - 0 - - - - - 0 - - - - - 0 - - - - - - - - - 100 - - - - - - - - - - 100 - - - + + - - - - - 440 - - - - - - - 100 - - - + - - - - text - - + - - - - - text - - - - - - 0 - - - + - - + - + - + @@ -199,137 +131,42 @@ - - - - - - 11 - 12 - 13 - - - - - - 0 - - - - - - - - 90 - - - - - - - 100 - - - - - - - text - - - - - - - - text - - - - - 0 - - - + - - - - - 440 - - - - - - - 100 - - - + - - - + - - - - - 0 - - - + + + - - - - - 90 - - - + - - - - text - - + - - - - text - - - - - 0 - - + - - + - + - + - + - + @@ -352,13 +189,6 @@ - - - - - - - @@ -468,18 +298,86 @@ + + + + 0 + + + + + 0 + + + + + 0 + + + - + + + + + 100 + + + - - - + + + + + + 100 + + + - + + + + + + 440 + + + + + + + 100 + + + - + + + + text + + + + + + + + text + + + + + + 0 + + + + + + @@ -589,12 +487,117 @@ + + + + + 11 + 12 + 13 + + + + + + 0 + + + + + + + + 90 + + + + + + + 100 + + + + + + + text + + + + + + + + text + + + + + 0 + + + + + + + + 440 + + + + + + + 100 + + + + - - + + - + + + + + 0 + + + + + + + + + + 90 + + + + + + + + + text + + + + + + + + text + + + + + 0 + + @@ -705,15 +708,6 @@ - - - - - - - - - @@ -734,12 +728,6 @@ - - - - - -