From afca67cee21c14d4c395d9ef6742bd9c261835b3 Mon Sep 17 00:00:00 2001
From: chrisgarrity <chrisg@media.mit.edu>
Date: Tue, 22 May 2018 14:17:05 -0400
Subject: [PATCH] Fix the merge
---
src/containers/blocks.jsx | 5 ++++-
src/containers/gui.jsx | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index fbcc66161..b275b463f 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -445,7 +445,10 @@ Blocks.defaultProps = {
};
const mapStateToProps = state => ({
- anyModalVisible: Object.keys(state.scratchGui.modals).some(key => state.scratchGui.modals[key]),
+ anyModalVisible: (
+ Object.keys(state.scratchGui.modals).some(key => state.scratchGui.modals[key]) ||
+ state.scratchGui.mode.isFullScreen
+ ),
extensionLibraryVisible: state.scratchGui.modals.extensionLibrary,
locale: state.intl.locale,
messages: state.intl.messages,
diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx
index c8d48a451..59e5b9426 100644
--- a/src/containers/gui.jsx
+++ b/src/containers/gui.jsx
@@ -109,8 +109,10 @@ const mapStateToProps = state => ({
isPlayerOnly: state.scratchGui.mode.isPlayerOnly,
loadingStateVisible: state.scratchGui.modals.loadingProject,
previewInfoVisible: state.scratchGui.modals.previewInfo,
- targetIsStage: state.scratchGui.targets.stage &&
- state.scratchGui.targets.stage.id === state.scratchGui.targets.editingTarget,
+ targetIsStage: (
+ state.scratchGui.targets.stage &&
+ state.scratchGui.targets.stage.id === state.scratchGui.targets.editingTarget
+ ),
soundsTabVisible: state.scratchGui.editorTab.activeTabIndex === SOUNDS_TAB_INDEX,
tipsLibraryVisible: state.scratchGui.modals.tipsLibrary
});
--
GitLab