From ad328c065e1d8fec6e5f11ed516f2becebba428d Mon Sep 17 00:00:00 2001
From: chrisgarrity <chrisg@media.mit.edu>
Date: Wed, 5 Dec 2018 15:23:06 -0500
Subject: [PATCH] rename isEmbedded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Liked @paulkaplan’s suggestion that the property get renamed `showBranding` as we use ‘embedded’ in multiple ways that would get confusing.

The embedded project view is ‘playerOnly’, ‘fullscreen’ and ‘showBranding’.
---
 src/components/stage-header/stage-header.jsx | 6 +++---
 src/containers/stage-header.jsx              | 4 ++--
 src/reducers/gui.js                          | 2 +-
 src/reducers/mode.js                         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/stage-header/stage-header.jsx b/src/components/stage-header/stage-header.jsx
index c72995a7e..4084f6bfc 100644
--- a/src/components/stage-header/stage-header.jsx
+++ b/src/components/stage-header/stage-header.jsx
@@ -49,7 +49,6 @@ const messages = defineMessages({
 
 const StageHeaderComponent = function (props) {
     const {
-        isEmbedded,
         isFullScreen,
         isPlayerOnly,
         onKeyPress,
@@ -57,6 +56,7 @@ const StageHeaderComponent = function (props) {
         onSetStageSmall,
         onSetStageFull,
         onSetStageUnFull,
+        showBranding,
         stageSizeMode,
         vm
     } = props;
@@ -65,7 +65,7 @@ const StageHeaderComponent = function (props) {
 
     if (isFullScreen) {
         const stageDimensions = getStageDimensions(null, true);
-        const stageButton = isEmbedded ? (
+        const stageButton = showBranding ? (
             <div className={styles.embedScratchLogo}>
                 <a
                     href="https://scratch.mit.edu"
@@ -182,7 +182,6 @@ const mapStateToProps = state => ({
 
 StageHeaderComponent.propTypes = {
     intl: intlShape,
-    isEmbedded: PropTypes.bool.isRequired,
     isFullScreen: PropTypes.bool.isRequired,
     isPlayerOnly: PropTypes.bool.isRequired,
     onKeyPress: PropTypes.func.isRequired,
@@ -190,6 +189,7 @@ StageHeaderComponent.propTypes = {
     onSetStageLarge: PropTypes.func.isRequired,
     onSetStageSmall: PropTypes.func.isRequired,
     onSetStageUnFull: PropTypes.func.isRequired,
+    showBranding: PropTypes.bool.isRequired,
     stageSizeMode: PropTypes.oneOf(Object.keys(STAGE_SIZE_MODES)),
     vm: PropTypes.instanceOf(VM).isRequired
 };
diff --git a/src/containers/stage-header.jsx b/src/containers/stage-header.jsx
index baf27689b..46d2a2343 100644
--- a/src/containers/stage-header.jsx
+++ b/src/containers/stage-header.jsx
@@ -43,17 +43,17 @@ class StageHeader extends React.Component {
 }
 
 StageHeader.propTypes = {
-    isEmbedded: PropTypes.bool,
     isFullScreen: PropTypes.bool,
     isPlayerOnly: PropTypes.bool,
     onSetStageUnFull: PropTypes.func.isRequired,
+    showBranding: PropTypes.bool,
     stageSizeMode: PropTypes.oneOf(Object.keys(STAGE_SIZE_MODES)),
     vm: PropTypes.instanceOf(VM).isRequired
 };
 
 const mapStateToProps = state => ({
     stageSizeMode: state.scratchGui.stageSize.stageSize,
-    isEmbedded: state.scratchGui.mode.isEmbedded,
+    showBranding: state.scratchGui.mode.showBranding,
     isFullScreen: state.scratchGui.mode.isFullScreen,
     isPlayerOnly: state.scratchGui.mode.isPlayerOnly
 });
diff --git a/src/reducers/gui.js b/src/reducers/gui.js
index 18bfe4ab0..3aa24e7d8 100644
--- a/src/reducers/gui.js
+++ b/src/reducers/gui.js
@@ -88,7 +88,7 @@ const initEmbedded = function (currentState) {
         {},
         currentState,
         {mode: {
-            isEmbedded: true,
+            showBranding: true,
             isFullScreen: true,
             isPlayerOnly: true,
             hasEverEnteredEditor: false
diff --git a/src/reducers/mode.js b/src/reducers/mode.js
index bf3c72d38..e07b0cda0 100644
--- a/src/reducers/mode.js
+++ b/src/reducers/mode.js
@@ -2,7 +2,7 @@ const SET_FULL_SCREEN = 'scratch-gui/mode/SET_FULL_SCREEN';
 const SET_PLAYER = 'scratch-gui/mode/SET_PLAYER';
 
 const initialState = {
-    isEmbedded: false,
+    showBranding: false,
     isFullScreen: false,
     isPlayerOnly: false,
     hasEverEnteredEditor: true
-- 
GitLab