From 5f7b8f5f792fd94945c4550ba89c2b639a08c05f Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Thu, 15 Sep 2016 12:49:19 -0400
Subject: [PATCH] Hook up skeleton VM to blocks
---
src/components/blocks.js | 3 +++
src/components/gui.js | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/src/components/blocks.js b/src/components/blocks.js
index 31bdd0270..f73e2de70 100644
--- a/src/components/blocks.js
+++ b/src/components/blocks.js
@@ -12,6 +12,9 @@ export default class Blocks extends React.Component {
component,
defaultsDeep({}, this.props.options, Blocks.defaultOptions)
);
+ if (this.props.vm) {
+ this.workspace.addChangeListener(this.props.vm.blockListener);
+ }
}
render () {
return (
diff --git a/src/components/gui.js b/src/components/gui.js
index 9d7465f6f..d0ebe1e37 100644
--- a/src/components/gui.js
+++ b/src/components/gui.js
@@ -12,12 +12,17 @@ export default class GUI extends React.Component {
options={{
toolbox: this.toolbox
}}
+ vm={this.props.vm}
/>
</div>
);
}
}
+GUI.propTypes = {
+ vm: React.PropTypes.object
+};
+
GUI.defaultProps = {
vm: new VM()
};
--
GitLab