From 98f97d63133ae915c2a891c1f9c08eea91fc56fc Mon Sep 17 00:00:00 2001 From: Mario Pesch Date: Fri, 10 Feb 2023 12:04:10 +0100 Subject: [PATCH] fix gallery --- src/actions/workspaceActions.js | 2 +- src/components/Blockly/BlocklyWindow.js | 4 +++- src/components/Navbar.js | 2 +- src/components/Project/ProjectHome.js | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/actions/workspaceActions.js b/src/actions/workspaceActions.js index da44286..b066687 100644 --- a/src/actions/workspaceActions.js +++ b/src/actions/workspaceActions.js @@ -16,7 +16,7 @@ export const onChangeCode = () => (dispatch, getState) => { code.arduino = Blockly.Arduino.workspaceToCode(workspace); var xmlDom = Blockly.Xml.workspaceToDom(workspace); code.xml = Blockly.Xml.domToPrettyText(xmlDom); - var selectedBlock = Blockly.selected + var selectedBlock = Blockly.getSelected if (selectedBlock !== null) { code.helpurl = selectedBlock.helpUrl code.tooltip = selectedBlock.tooltip diff --git a/src/components/Blockly/BlocklyWindow.js b/src/components/Blockly/BlocklyWindow.js index ffdb8f8..6db7e64 100644 --- a/src/components/Blockly/BlocklyWindow.js +++ b/src/components/Blockly/BlocklyWindow.js @@ -43,8 +43,9 @@ class BlocklyWindow extends Component { componentDidUpdate(props) { const workspace = Blockly.getMainWorkspace(); - var xml = localStorage.getItem("autoSaveXML"); + var xml = this.props.initialXml; if (props.selectedBoard !== this.props.selectedBoard) { + var xml = localStorage.getItem("autoSaveXML"); // change board if(!xml) xml = initialXml; var xmlDom = Blockly.Xml.textToDom(xml); @@ -62,6 +63,7 @@ class BlocklyWindow extends Component { } if (props.language !== this.props.language) { // change language + var xml = localStorage.getItem("autoSaveXML"); if (!xml) xml = initialXml; xmlDom = Blockly.Xml.textToDom(xml); Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace); diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 954af1b..b18e3f9 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -146,7 +146,7 @@ class Navbar extends Component { this.props.selectedBoard === "mcu" ? (