Skip to content

Commit 4924b95

Browse files
Merge pull request #9728 from scratchfoundation/onboarding-integration
Onboarding integration
2 parents 861d0ef + 2d13a9d commit 4924b95

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/components/menu-bar/menu-bar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ class MenuBar extends React.Component {
690690
<div className={styles.fileGroup}>
691691
<div
692692
aria-label={this.props.intl.formatMessage(ariaMessages.tutorials)}
693-
className={classNames(styles.menuBarItem, styles.hoverable)}
693+
className={classNames(styles.menuBarItem, styles.hoverable, 'tutorials-button')}
694694
onClick={this.props.onOpenTipLibrary}
695695
>
696696
<img

src/containers/gui.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ class GUI extends React.Component {
7272
// At this time the project view in www doesn't need to know when a project is unloaded
7373
this.props.onProjectLoaded();
7474
}
75+
if (this.props.shouldStopProject && !prevProps.shouldStopProject) {
76+
this.props.vm.stopAll();
77+
}
7578
}
7679
render () {
7780
if (this.props.isError) {
@@ -130,6 +133,7 @@ GUI.propTypes = {
130133
onVmInit: PropTypes.func,
131134
projectHost: PropTypes.string,
132135
projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
136+
shouldStopProject: PropTypes.bool,
133137
telemetryModalVisible: PropTypes.bool,
134138
vm: PropTypes.instanceOf(VM).isRequired
135139
};

src/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {ScratchPaintReducer} from 'scratch-paint';
66
import {setFullScreen, setPlayer} from './reducers/mode';
77
import {remixProject} from './reducers/project-state';
88
import {setAppElement} from 'react-modal';
9+
import {activateDeck} from './reducers/cards.js';
910

1011
const guiReducers = {
1112
locales: LocalesReducer,
@@ -27,5 +28,6 @@ export {
2728
localesInitialState,
2829
remixProject,
2930
setFullScreen,
30-
setPlayer
31+
setPlayer,
32+
activateDeck
3133
};

0 commit comments

Comments
 (0)