From a96d786e236e59cfeaf39a77342c17b6ffaf82c9 Mon Sep 17 00:00:00 2001
From: Tim Stallard <code@timstallard.me.uk>
Date: Mon, 27 Feb 2017 10:38:33 +0000
Subject: [PATCH] Added changing name of diagram

---
 client/src/index.html                 |  1 +
 client/src/menu.js                    | 17 +++++++++++++++--
 client/src/outputCalculation.js       |  4 ++--
 client/src/pageInteraction/joining.js |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/client/src/index.html b/client/src/index.html
index 1d7a762..591c80e 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -4,6 +4,7 @@
   </head>
   <body>
     <div id="header">
+      <a href="#" id="projectName">New Diagram</a>
       <a href="#" id="import">Open File</a>
       <a href="#" id="export">Save</a>
       <input type="file" id="importUpload"></input>
diff --git a/client/src/menu.js b/client/src/menu.js
index 21f2505..cd595f2 100644
--- a/client/src/menu.js
+++ b/client/src/menu.js
@@ -1,4 +1,6 @@
 var $ = require("jquery");
+var events = require("./events.js");
+var diagram = require("./diagram");
 
 $("#header>a#export").click(function(){
   var fileSaver = require("file-saver");
@@ -17,5 +19,16 @@ $("#header>#importUpload").change(function(){
     require("./diagram/import.js")(reader.result);
   }
   reader.readAsText(this.files[0]);
-  //console.log($("#header>#importUpload")[0].files[0])
-})
+});
+
+$("#header>a#projectName").click(function(){
+  do{
+    diagram.name = prompt("Please enter a name for the diagram", diagram.name);
+  }
+  while(!diagram.name);
+  $("#header>a#projectName").html(diagram.name);
+});
+
+events.subscribe("diagramImport", function(){
+  $("#header>a#projectName").html(diagram.name);
+});
diff --git a/client/src/outputCalculation.js b/client/src/outputCalculation.js
index 3a60eed..35d710b 100644
--- a/client/src/outputCalculation.js
+++ b/client/src/outputCalculation.js
@@ -15,8 +15,8 @@ function resolveOutput(block, cache){
   }
 
   var output = "";
-  if(Object.keys(blocks[block.type].inputs).length == Object.keys(inputValues).length){
-    var output = blocks[block.type].execute(inputValues, block);
+  if(Object.keys(blocks[block.type].inputs).length == Object.keys(inputValues).length){ //only execute if all inputs are present
+    output = blocks[block.type].execute(inputValues, block);
   }
   cache[block.id] = output;
 
diff --git a/client/src/pageInteraction/joining.js b/client/src/pageInteraction/joining.js
index 9401090..6e68a27 100644
--- a/client/src/pageInteraction/joining.js
+++ b/client/src/pageInteraction/joining.js
@@ -4,7 +4,7 @@ var events = require("../events.js");
 var $ = require("jquery");
 
 function moveLine(elem, a, b, c, d){
-  [[a, b], [c, d]] = [[a, b], [c, d]].sort((a, b)=>(a[0] > b[0])); //swap coords based on x-value, a will always be smaller than b
+  [[a, b], [c, d]] = [[a, b], [c, d]].sort((a, b)=>(a[0] - b[0])); //swap coords based on x-value, a will always be smaller than b
   var l = Math.sqrt(Math.pow(a  - c, 2) + Math.pow(d - b, 2));
   var x = (a + c - l) / 2;
   var y = (b + d) / 2;
