mirror of
https://github.com/scratchfoundation/scratch-gui.git
synced 2024-11-25 16:26:20 +08:00
Merge pull request #9728 from scratchfoundation/onboarding-integration
Onboarding integration
This commit is contained in:
commit
4924b9519a
@ -690,7 +690,7 @@ class MenuBar extends React.Component {
|
||||
<div className={styles.fileGroup}>
|
||||
<div
|
||||
aria-label={this.props.intl.formatMessage(ariaMessages.tutorials)}
|
||||
className={classNames(styles.menuBarItem, styles.hoverable)}
|
||||
className={classNames(styles.menuBarItem, styles.hoverable, 'tutorials-button')}
|
||||
onClick={this.props.onOpenTipLibrary}
|
||||
>
|
||||
<img
|
||||
|
@ -72,6 +72,9 @@ class GUI extends React.Component {
|
||||
// At this time the project view in www doesn't need to know when a project is unloaded
|
||||
this.props.onProjectLoaded();
|
||||
}
|
||||
if (this.props.shouldStopProject && !prevProps.shouldStopProject) {
|
||||
this.props.vm.stopAll();
|
||||
}
|
||||
}
|
||||
render () {
|
||||
if (this.props.isError) {
|
||||
@ -130,6 +133,7 @@ GUI.propTypes = {
|
||||
onVmInit: PropTypes.func,
|
||||
projectHost: PropTypes.string,
|
||||
projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
|
||||
shouldStopProject: PropTypes.bool,
|
||||
telemetryModalVisible: PropTypes.bool,
|
||||
vm: PropTypes.instanceOf(VM).isRequired
|
||||
};
|
||||
|
@ -6,6 +6,7 @@ import {ScratchPaintReducer} from 'scratch-paint';
|
||||
import {setFullScreen, setPlayer} from './reducers/mode';
|
||||
import {remixProject} from './reducers/project-state';
|
||||
import {setAppElement} from 'react-modal';
|
||||
import {activateDeck} from './reducers/cards.js';
|
||||
|
||||
const guiReducers = {
|
||||
locales: LocalesReducer,
|
||||
@ -27,5 +28,6 @@ export {
|
||||
localesInitialState,
|
||||
remixProject,
|
||||
setFullScreen,
|
||||
setPlayer
|
||||
setPlayer,
|
||||
activateDeck
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user