From d7d1ad9ea1089928ae4dfb370d6975d366a2595f Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Thu, 4 May 2017 13:09:17 -0400
Subject: [PATCH] Move VM into a reducer
Otherwise it's very annoying to get access to the storage engine to load asset data.
---
src/lib/vm-listener-hoc.jsx | 11 ++++-------
src/reducers/gui.js | 3 ++-
src/reducers/vm.js | 24 ++++++++++++++++++++++++
3 files changed, 30 insertions(+), 8 deletions(-)
create mode 100644 src/reducers/vm.js
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx
index 8c80ae5d9..58ea1ca71 100644
--- a/src/lib/vm-listener-hoc.jsx
+++ b/src/lib/vm-listener-hoc.jsx
@@ -3,8 +3,6 @@ const PropTypes = require('prop-types');
const React = require('react');
const VM = require('scratch-vm');
-const Storage = require('./storage');
-
const {connect} = require('react-redux');
const targets = require('../reducers/targets');
@@ -92,13 +90,12 @@ const vmListenerHOC = function (WrappedComponent) {
onTargetsUpdate: PropTypes.func,
vm: PropTypes.instanceOf(VM).isRequired
};
- const defaultVM = new VM('vm-listener-hoc');
- defaultVM.attachStorage(new Storage());
VMListener.defaultProps = {
- attachKeyboardEvents: true,
- vm: defaultVM
+ attachKeyboardEvents: true
};
- const mapStateToProps = () => ({});
+ const mapStateToProps = state => ({
+ vm: state.vm
+ });
const mapDispatchToProps = dispatch => ({
onTargetsUpdate: data => {
dispatch(targets.updateEditingTarget(data.editingTarget));
diff --git a/src/reducers/gui.js b/src/reducers/gui.js
index bde1a2f3f..9b1cf6067 100644
--- a/src/reducers/gui.js
+++ b/src/reducers/gui.js
@@ -2,6 +2,7 @@ const {combineReducers} = require('redux');
module.exports = combineReducers({
modals: require('./modals'),
+ monitors: require('./monitors'),
targets: require('./targets'),
- monitors: require('./monitors')
+ vm: require('./vm')
});
diff --git a/src/reducers/vm.js b/src/reducers/vm.js
new file mode 100644
index 000000000..1fd0eb4a2
--- /dev/null
+++ b/src/reducers/vm.js
@@ -0,0 +1,24 @@
+const VM = require('scratch-vm');
+const Storage = require('../lib/storage');
+
+const SET_VM = 'scratch-gui/vm/SET_VM';
+const defaultVM = new VM();
+defaultVM.attachStorage(new Storage());
+const initialState = defaultVM;
+
+const reducer = function (state, action) {
+ if (typeof state === 'undefined') state = initialState;
+ switch (action.type) {
+ case SET_VM:
+ return action.vm;
+ default:
+ return state;
+ }
+};
+reducer.setVM = function (vm) {
+ return {
+ type: SET_VM,
+ vm: vm
+ };
+};
+module.exports = reducer;
--
GitLab