From 90c40716a6d98c474c8763173580b4b6f3e61d00 Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Wed, 7 Dec 2016 19:02:38 -0500
Subject: [PATCH] Move MediaLibrary init to target-pane
It was not being used by GUI so no reason for it to be initialized there
---
src/components/gui/gui.jsx | 5 -----
src/components/target-pane/target-pane.jsx | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx
index 31e5e6ae2..7157e8514 100644
--- a/src/components/gui/gui.jsx
+++ b/src/components/gui/gui.jsx
@@ -2,7 +2,6 @@ const defaultsDeep = require('lodash.defaultsdeep');
const React = require('react');
const VM = require('scratch-vm');
-const MediaLibrary = require('../../lib/media-library');
const shapeFromPropTypes = require('../../lib/shape-from-prop-types');
const Blocks = require('../../containers/blocks.jsx');
@@ -19,7 +18,6 @@ const GUIComponent = props => {
blocksProps,
children,
greenFlagProps,
- mediaLibrary,
targetPaneProps,
stageProps,
stopAllProps,
@@ -52,7 +50,6 @@ const GUIComponent = props => {
{...stageProps}
/>
<TargetPane
- mediaLibrary={mediaLibrary}
vm={vm}
{...targetPaneProps}
/>
@@ -69,7 +66,6 @@ GUIComponent.propTypes = {
blocksProps: shapeFromPropTypes(Blocks.propTypes, {omit: ['vm']}),
children: React.PropTypes.node,
greenFlagProps: shapeFromPropTypes(GreenFlag.propTypes, {omit: ['vm']}),
- mediaLibrary: React.PropTypes.instanceOf(MediaLibrary),
stageProps: shapeFromPropTypes(Stage.propTypes, {omit: ['vm']}),
stopAllProps: shapeFromPropTypes(StopAll.propTypes, {omit: ['vm']}),
targetPaneProps: shapeFromPropTypes(TargetPane.propTypes, {omit: ['vm']}),
@@ -80,7 +76,6 @@ GUIComponent.defaultProps = {
basePath: '/',
blocksProps: {},
greenFlagProps: {},
- mediaLibrary: new MediaLibrary(),
targetPaneProps: {},
stageProps: {},
stopAllProps: {},
diff --git a/src/components/target-pane/target-pane.jsx b/src/components/target-pane/target-pane.jsx
index 48883747a..0fa5c6245 100644
--- a/src/components/target-pane/target-pane.jsx
+++ b/src/components/target-pane/target-pane.jsx
@@ -113,4 +113,8 @@ TargetPane.propTypes = {
vm: React.PropTypes.instanceOf(VM)
};
+TargetPane.defaultProps = {
+ mediaLibrary: new MediaLibrary()
+};
+
module.exports = TargetPane;
--
GitLab