From 70e1e181f710eb597b0c57c6e68f85d49de52b1c Mon Sep 17 00:00:00 2001
From: Karishma Chadha <kchadha@scratch.mit.edu>
Date: Fri, 6 Jul 2018 15:35:47 -0400
Subject: [PATCH] Update showMoreOptions logic to include checks against rename
variable/list modals.
---
src/containers/blocks.jsx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index f9db7468b..40ad9234e 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -321,11 +321,13 @@ class Blocks extends React.Component {
handlePromptStart (message, defaultValue, callback, optTitle, optVarType) {
const p = {prompt: {callback, message, defaultValue}};
p.prompt.title = optTitle ? optTitle :
- this.ScratchBlocks.VARIABLE_MODAL_TITLE;
+ this.ScratchBlocks.Msg.VARIABLE_MODAL_TITLE;
p.prompt.varType = typeof optVarType === 'string' ?
optVarType : this.ScratchBlocks.SCALAR_VARIABLE_TYPE;
p.prompt.showMoreOptions =
- optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE;
+ optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE &&
+ p.prompt.title !== this.ScratchBlocks.Msg.RENAME_VARIABLE_MODAL_TITLE &&
+ p.prompt.title !== this.ScratchBlocks.Msg.RENAME_LIST_MODAL_TITLE;
this.setState(p);
}
handlePromptCallback (input, optionSelection) {
--
GitLab