From fe6078cce12dd64b0c4079ac39809ddcf71316c9 Mon Sep 17 00:00:00 2001
From: DD <liudi08@gmail.com>
Date: Fri, 2 Mar 2018 13:30:02 -0500
Subject: [PATCH] Move backdrop library back to costumes tab
---
src/components/stage-selector/stage-selector.jsx | 4 ++--
src/components/target-pane/target-pane.jsx | 11 -----------
src/containers/backdrop-library.jsx | 2 +-
src/containers/costume-tab.jsx | 14 ++++++++++++++
src/containers/target-pane.jsx | 7 +------
src/index.ejs | 2 +-
6 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/components/stage-selector/stage-selector.jsx b/src/components/stage-selector/stage-selector.jsx
index 073ca257c..8016caeca 100644
--- a/src/components/stage-selector/stage-selector.jsx
+++ b/src/components/stage-selector/stage-selector.jsx
@@ -94,12 +94,12 @@ const StageSelector = props => {
}, {
title: intl.formatMessage(messages.addBackdropFromSurprise),
img: surpriseIcon,
- onClick: onSurpriseBackdropClick // TODO NEED REAL FUNCTION
+ onClick: onSurpriseBackdropClick
}, {
title: intl.formatMessage(messages.addBackdropFromPaint),
img: paintIcon,
- onClick: onEmptyBackdropClick // TODO NEED REAL FUNCTION
+ onClick: onEmptyBackdropClick
}
]}
title={intl.formatMessage(messages.addBackdropFromLibrary)}
diff --git a/src/components/target-pane/target-pane.jsx b/src/components/target-pane/target-pane.jsx
index 1044073a1..7cc7a1ed2 100644
--- a/src/components/target-pane/target-pane.jsx
+++ b/src/components/target-pane/target-pane.jsx
@@ -4,7 +4,6 @@ import React from 'react';
import VM from 'scratch-vm';
import SpriteLibrary from '../../containers/sprite-library.jsx';
-import BackdropLibrary from '../../containers/backdrop-library.jsx';
import SpriteSelectorComponent from '../sprite-selector/sprite-selector.jsx';
import StageSelector from '../../containers/stage-selector.jsx';
@@ -17,7 +16,6 @@ import styles from './target-pane.css';
* @returns {React.Component} rendered component
*/
const TargetPane = ({
- backdropLibraryVisible,
editingTarget,
hoveredTarget,
spriteLibraryVisible,
@@ -33,7 +31,6 @@ const TargetPane = ({
onSurpriseSpriteClick,
onPaintSpriteClick,
onRequestCloseSpriteLibrary,
- onRequestCloseBackdropLibrary,
onSelectSprite,
raiseSprites,
stage,
@@ -83,12 +80,6 @@ const TargetPane = ({
onRequestClose={onRequestCloseSpriteLibrary}
/>
) : null}
- {backdropLibraryVisible ? (
- <BackdropLibrary
- vm={vm}
- onRequestClose={onRequestCloseBackdropLibrary}
- />
- ) : null}
</div>
</div>
</div>
@@ -113,7 +104,6 @@ const spriteShape = PropTypes.shape({
});
TargetPane.propTypes = {
- backdropLibraryVisible: PropTypes.bool,
editingTarget: PropTypes.string,
extensionLibraryVisible: PropTypes.bool,
hoveredTarget: PropTypes.shape({
@@ -130,7 +120,6 @@ TargetPane.propTypes = {
onDuplicateSprite: PropTypes.func,
onNewSpriteClick: PropTypes.func,
onPaintSpriteClick: PropTypes.func,
- onRequestCloseBackdropLibrary: PropTypes.func,
onRequestCloseExtensionLibrary: PropTypes.func,
onRequestCloseSpriteLibrary: PropTypes.func,
onSelectSprite: PropTypes.func,
diff --git a/src/containers/backdrop-library.jsx b/src/containers/backdrop-library.jsx
index e6b7d4d39..68f373ece 100644
--- a/src/containers/backdrop-library.jsx
+++ b/src/containers/backdrop-library.jsx
@@ -47,7 +47,7 @@ class BackdropLibrary extends React.Component {
}
BackdropLibrary.propTypes = {
- onNewBackdrop: PropTypes.func,
+ onNewBackdrop: PropTypes.func.isRequired,
onRequestClose: PropTypes.func,
vm: PropTypes.instanceOf(VM).isRequired
};
diff --git a/src/containers/costume-tab.jsx b/src/containers/costume-tab.jsx
index 2e897c451..d0e3f9e42 100644
--- a/src/containers/costume-tab.jsx
+++ b/src/containers/costume-tab.jsx
@@ -7,10 +7,12 @@ import VM from 'scratch-vm';
import AssetPanel from '../components/asset-panel/asset-panel.jsx';
import PaintEditorWrapper from './paint-editor-wrapper.jsx';
import CostumeLibrary from './costume-library.jsx';
+import BackdropLibrary from './backdrop-library.jsx';
import {connect} from 'react-redux';
import {
closeCostumeLibrary,
+ closeBackdropLibrary,
openCostumeLibrary,
openBackdropLibrary
} from '../reducers/modals';
@@ -160,7 +162,9 @@ class CostumeTab extends React.Component {
intl,
onNewLibraryBackdropClick,
onNewLibraryCostumeClick,
+ backdropLibraryVisible,
costumeLibraryVisible,
+ onRequestCloseBackdropLibrary,
onRequestCloseCostumeLibrary,
...props
} = this.props;
@@ -230,6 +234,13 @@ class CostumeTab extends React.Component {
onRequestClose={onRequestCloseCostumeLibrary}
/>
) : null}
+ {backdropLibraryVisible ? (
+ <BackdropLibrary
+ vm={vm}
+ onNewBackdrop={this.handleNewCostume}
+ onRequestClose={onRequestCloseBackdropLibrary}
+ />
+ ) : null}
</AssetPanel>
);
}
@@ -278,6 +289,9 @@ const mapDispatchToProps = dispatch => ({
e.preventDefault();
dispatch(openCostumeLibrary());
},
+ onRequestCloseBackdropLibrary: () => {
+ dispatch(closeBackdropLibrary());
+ },
onRequestCloseCostumeLibrary: () => {
dispatch(closeCostumeLibrary());
}
diff --git a/src/containers/target-pane.jsx b/src/containers/target-pane.jsx
index 889d84185..e2bad31b7 100644
--- a/src/containers/target-pane.jsx
+++ b/src/containers/target-pane.jsx
@@ -5,7 +5,6 @@ import {connect} from 'react-redux';
import {
openSpriteLibrary,
- closeBackdropLibrary,
closeSpriteLibrary
} from '../reducers/modals';
@@ -132,8 +131,7 @@ const mapStateToProps = state => ({
}, {}),
stage: state.targets.stage,
raiseSprites: state.blockDrag,
- spriteLibraryVisible: state.modals.spriteLibrary,
- backdropLibraryVisible: state.modals.backdropLibrary
+ spriteLibraryVisible: state.modals.spriteLibrary
});
const mapDispatchToProps = dispatch => ({
onNewSpriteClick: e => {
@@ -143,9 +141,6 @@ const mapDispatchToProps = dispatch => ({
onRequestCloseSpriteLibrary: () => {
dispatch(closeSpriteLibrary());
},
- onRequestCloseBackdropLibrary: () => {
- dispatch(closeBackdropLibrary());
- },
onActivateTab: tabIndex => {
dispatch(activateTab(tabIndex));
},
diff --git a/src/index.ejs b/src/index.ejs
index 3f824efb0..964efa23c 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -9,7 +9,7 @@
<!-- Sentry error logging to help with finding bugs -->
<script src="https://cdn.ravenjs.com/3.22.1/raven.min.js" crossorigin="anonymous"></script>
<script>
- Raven.config('https://42b7d13da8ad4d68b13e57c5e54f9a23@sentry.io/273218').install();
+ // Raven.config('https://42b7d13da8ad4d68b13e57c5e54f9a23@sentry.io/273218').install();
</script>
<!-- /Sentry -->
--
GitLab