From f4a613420d2df721bcbff8ad6fe59ed72ae8e8ac Mon Sep 17 00:00:00 2001 From: Tim Stallard Date: Tue, 14 Mar 2017 09:35:51 +0000 Subject: [PATCH] Added comment, made custom code block inputs not required --- src/blocks/custom.js | 12 ++++++------ src/outputCalculation.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/blocks/custom.js b/src/blocks/custom.js index d1b6124..6e740a6 100644 --- a/src/blocks/custom.js +++ b/src/blocks/custom.js @@ -6,31 +6,31 @@ module.exports = { inp1: { name: "1", type: "text", - required: true, + required: false, inline: false }, inp2: { name: "2", type: "text", - required: true, + required: false, inline: false }, inp3: { name: "3", type: "text", - required: true, + required: false, inline: false }, inp4: { name: "4", type: "text", - required: true, + required: false, inline: false }, inp5: { name: "5", type: "text", - required: true, + required: false, inline: false } }, @@ -40,7 +40,7 @@ module.exports = { return customFunc(inputs.inp1, inputs.inp2, inputs.inp3, inputs.inp4, inputs.inp5); }, pageBlock: { - html: "To access inputs, use vars inp1, inp2, etc
", + html: "To access inputs, use vars inp1, inp2, etc. Use return to output.
", js: function(block){ if(block.properties.code){ block.elem.find("textarea").val(block.properties.code); diff --git a/src/outputCalculation.js b/src/outputCalculation.js index ab0f76a..e651b6c 100644 --- a/src/outputCalculation.js +++ b/src/outputCalculation.js @@ -39,7 +39,7 @@ function resolveOutput(block, cache){ } } -function calculateOutputBlocks(){ +function calculateOutputBlocks(){ //resolve the output for frequency and output blocks, their execute functions will handle displaying var cache = {}; var outputBlocks = diagram.state.filter((block)=>((block.type == "output") || (block.type == "frequency"))); for(var block of outputBlocks){