Tim/CryptoAssist
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added changing name of diagram

Browse Source
This commit is contained in:
Tim Stallard
2017-02-27 10:38:33 +00:00
parent 69547f6114
commit a96d786e23
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/index.html
View File

@@ -4,6 +4,7 @@
</head> </head>
<body> <body>
<div id="header"> <div id="header">
<a href="#" id="projectName">New Diagram</a>
<a href="#" id="import">Open File</a> <a href="#" id="import">Open File</a>
<a href="#" id="export">Save</a> <a href="#" id="export">Save</a>
<input type="file" id="importUpload"></input> <input type="file" id="importUpload"></input>

17
client/src/menu.js
View File

@@ -1,4 +1,6 @@
var $ = require("jquery"); var $ = require("jquery");
var events = require("./events.js");
var diagram = require("./diagram");
$("#header>a#export").click(function(){ $("#header>a#export").click(function(){
var fileSaver = require("file-saver"); var fileSaver = require("file-saver");
@@ -17,5 +19,16 @@ $("#header>#importUpload").change(function(){
require("./diagram/import.js")(reader.result); require("./diagram/import.js")(reader.result);
} }
reader.readAsText(this.files[0]); 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);
});

4
client/src/outputCalculation.js
View File

@@ -15,8 +15,8 @@ function resolveOutput(block, cache){
} }
var output = ""; var output = "";
if(Object.keys(blocks[block.type].inputs).length == Object.keys(inputValues).length){ if(Object.keys(blocks[block.type].inputs).length == Object.keys(inputValues).length){ //only execute if all inputs are present
var output = blocks[block.type].execute(inputValues, block); output = blocks[block.type].execute(inputValues, block);
} }
cache[block.id] = output; cache[block.id] = output;

2
client/src/pageInteraction/joining.js
View File

@@ -4,7 +4,7 @@ var events = require("../events.js");
var $ = require("jquery"); var $ = require("jquery");
function moveLine(elem, a, b, c, d){ 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 l = Math.sqrt(Math.pow(a - c, 2) + Math.pow(d - b, 2));
var x = (a + c - l) / 2; var x = (a + c - l) / 2;
var y = (b + d) / 2; var y = (b + d) / 2;