From 95a01d56387ec531daac278161bf1853e2682ade Mon Sep 17 00:00:00 2001 From: Tim Stallard Date: Sat, 18 Mar 2017 11:07:43 +0000 Subject: [PATCH] Made default value shown in inline box, removed non required line --- src/diagram/import.js | 1 - src/pageInteraction/dragDrop.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/diagram/import.js b/src/diagram/import.js index ac63b3c..6e8c962 100644 --- a/src/diagram/import.js +++ b/src/diagram/import.js @@ -14,7 +14,6 @@ module.exports = function(newDiagram){ accepted = confirm("This document contains Javascript. You should only allow this document to be opened if you trust the source."); } if(accepted){ - if(newDiagramObject.state.filter((block)=>(block.type == "custom")).length) customCode = true; Object.assign(diagram, newDiagramObject); $("#workspace>*").remove(); for(var block of diagram.state){ diff --git a/src/pageInteraction/dragDrop.js b/src/pageInteraction/dragDrop.js index db67fd5..5156120 100644 --- a/src/pageInteraction/dragDrop.js +++ b/src/pageInteraction/dragDrop.js @@ -20,7 +20,7 @@ function blockPositionChange(event){ //fired when a block is moved or added } } -$("#blocks").on("mousedown", ".block>.main,.block>.inputs", function(event){ +$("#blocks").on("mousedown", ".block>.main,.block>.inputs", function(event){ //add new block var newBlock = { id: uuid.v4(), position: { @@ -38,7 +38,7 @@ $("#blocks").on("mousedown", ".block>.main,.block>.inputs", function(event){ .reduce((inputs, input)=>{ //turn this into an object inputs[input] = { joined: "", - value: "" + value: blocks[$(this).parent().data("type")].inputs[input].default || "" //use default value if present }; return inputs; }, {}),