diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx index dfcc7d8dd..3c68eec90 100644 --- a/src/components/gui/gui.jsx +++ b/src/components/gui/gui.jsx @@ -66,8 +66,10 @@ const GUIComponent = props => { backpackVisible, blocksTabVisible, cardsVisible, + canChangeLanguage, canCreateNew, canEditTitle, + canManageFiles, canRemix, canSave, canCreateCopy, @@ -85,6 +87,7 @@ const GUIComponent = props => { isRtl, isShared, loading, + logo, renderLogin, onClickAccountNav, onCloseAccountNav, @@ -202,15 +205,18 @@ const GUIComponent = props => { authorId={authorId} authorThumbnailUrl={authorThumbnailUrl} authorUsername={authorUsername} + canChangeLanguage={canChangeLanguage} canCreateCopy={canCreateCopy} canCreateNew={canCreateNew} canEditTitle={canEditTitle} + canManageFiles={canManageFiles} canRemix={canRemix} canSave={canSave} canShare={canShare} className={styles.menuBarPosition} enableCommunity={enableCommunity} isShared={isShared} + logo={logo} renderLogin={renderLogin} showComingSoon={showComingSoon} onClickAccountNav={onClickAccountNav} @@ -359,9 +365,11 @@ GUIComponent.propTypes = { backpackVisible: PropTypes.bool, basePath: PropTypes.string, blocksTabVisible: PropTypes.bool, + canChangeLanguage: PropTypes.bool, canCreateCopy: PropTypes.bool, canCreateNew: PropTypes.bool, canEditTitle: PropTypes.bool, + canManageFiles: PropTypes.bool, canRemix: PropTypes.bool, canSave: PropTypes.bool, canShare: PropTypes.bool, @@ -378,6 +386,7 @@ GUIComponent.propTypes = { isRtl: PropTypes.bool, isShared: PropTypes.bool, loading: PropTypes.bool, + logo: PropTypes.string, onActivateCostumesTab: PropTypes.func, onActivateSoundsTab: PropTypes.func, onActivateTab: PropTypes.func, @@ -411,8 +420,10 @@ GUIComponent.defaultProps = { backpackHost: null, backpackVisible: false, basePath: './', + canChangeLanguage: true, canCreateNew: false, canEditTitle: false, + canManageFiles: true, canRemix: false, canSave: false, canCreateCopy: false, diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx index 6105a60e5..1fa7a01cc 100644 --- a/src/components/menu-bar/menu-bar.jsx +++ b/src/components/menu-bar/menu-bar.jsx @@ -154,7 +154,7 @@ class MenuBar extends React.Component { 'handleKeyPress', 'handleLanguageMouseUp', 'handleRestoreOption', - 'handleSaveToComputer', + 'getSaveToComputerHandler', 'restoreOptionMessage' ]); } @@ -225,7 +225,7 @@ class MenuBar extends React.Component { event.preventDefault(); } } - handleSaveToComputer (downloadProjectCallback) { + getSaveToComputerHandler (downloadProjectCallback) { return () => { this.props.onRequestCloseFile(); downloadProjectCallback(); @@ -327,11 +327,11 @@ class MenuBar extends React.Component { [styles.clickable]: typeof this.props.onClickLogo !== 'undefined' })} draggable={false} - src={scratchLogo} + src={this.props.logo} onClick={this.props.onClickLogo} /> -