diff --git a/src/components/stage-header/stage-header.jsx b/src/components/stage-header/stage-header.jsx index c72995a7e7674ef5563660722ab535e05ec8c470..4084f6bfc3d4add5a48d5834d7c2f45f89cc2e25 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 baf27689bf74dd73a347838e1f0b9752e743b3d5..46d2a2343c66b078942af82f99317747cbcab500 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 18bfe4ab0d838e5c9cb45289a62d633992ff1c5d..3aa24e7d864cb497d1db14833ff7c8db8f70096f 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 bf3c72d38b47307bf9a222454cf843cd802e9f64..e07b0cda008ccfe70658157e18b6f453df28020b 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