From 6d482fdd5ef90e073eac68cdd36e65f50fbebc3d Mon Sep 17 00:00:00 2001
From: Chris Garrity <chrisg@media.mit.edu>
Date: Fri, 28 Jun 2019 11:49:01 -0400
Subject: [PATCH] Allow customized logo
Show alternate logo if GUI is initialized with a different file.
---
src/components/gui/gui.jsx | 3 +++
src/components/menu-bar/menu-bar.jsx | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx
index f8311e254..3c68eec90 100644
--- a/src/components/gui/gui.jsx
+++ b/src/components/gui/gui.jsx
@@ -87,6 +87,7 @@ const GUIComponent = props => {
isRtl,
isShared,
loading,
+ logo,
renderLogin,
onClickAccountNav,
onCloseAccountNav,
@@ -215,6 +216,7 @@ const GUIComponent = props => {
className={styles.menuBarPosition}
enableCommunity={enableCommunity}
isShared={isShared}
+ logo={logo}
renderLogin={renderLogin}
showComingSoon={showComingSoon}
onClickAccountNav={onClickAccountNav}
@@ -384,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,
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index d4a5393e0..0222e2bab 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/src/components/menu-bar/menu-bar.jsx
@@ -327,7 +327,7 @@ class MenuBar extends React.Component {
[styles.clickable]: typeof this.props.onClickLogo !== 'undefined'
})}
draggable={false}
- src={scratchLogo}
+ src={this.props.logo ? this.props.logo : scratchLogo}
onClick={this.props.onClickLogo}
/>
</div>
@@ -723,6 +723,7 @@ MenuBar.propTypes = {
languageMenuOpen: PropTypes.bool,
locale: PropTypes.string.isRequired,
loginMenuOpen: PropTypes.bool,
+ logo: PropTypes.string,
onClickAccount: PropTypes.func,
onClickEdit: PropTypes.func,
onClickFile: PropTypes.func,
--
GitLab