From 33ad92704fb9b8d786f81d43323ce85710c14ce8 Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Mon, 29 Jan 2018 19:39:05 -0500 Subject: [PATCH 1/2] Showing/hiding 'more options' in the different types of variable prompts based on var type provided from scratch blocks --- src/containers/blocks.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx index 5be1498e1..ca5d2bb97 100644 --- a/src/containers/blocks.jsx +++ b/src/containers/blocks.jsx @@ -235,10 +235,11 @@ class Blocks extends React.Component { setBlocks (blocks) { this.blocks = blocks; } - handlePromptStart (message, defaultValue, callback, optTitle) { + handlePromptStart (message, defaultValue, callback, optTitle, optVarType) { const p = {prompt: {callback, message, defaultValue}}; p.prompt.title = optTitle ? optTitle : 'New Variable'; - p.prompt.showMoreOptions = optTitle !== 'New Message'; + p.prompt.showMoreOptions = + optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE; this.setState(p); } handlePromptCallback (data) { From 180a1ac517170862e462b627c2c95467887a44ff Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Mon, 29 Jan 2018 19:56:13 -0500 Subject: [PATCH 2/2] Don't use a hard-coded string... --- src/containers/blocks.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx index ca5d2bb97..a53b48760 100644 --- a/src/containers/blocks.jsx +++ b/src/containers/blocks.jsx @@ -237,7 +237,8 @@ class Blocks extends React.Component { } handlePromptStart (message, defaultValue, callback, optTitle, optVarType) { const p = {prompt: {callback, message, defaultValue}}; - p.prompt.title = optTitle ? optTitle : 'New Variable'; + p.prompt.title = optTitle ? optTitle : + this.ScratchBlocks.VARIABLE_MODAL_TITLE; p.prompt.showMoreOptions = optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE; this.setState(p);