KingOfDog/fsm-designer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying up a little bit and implementing file (.fsm) import

Browse Source
This commit is contained in:
Marcel 2019-03-05 19:56:42 +01:00
parent e923d3efca
commit dc41fd7ba9
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/export/export.js
View File

@ -1,4 +1,4 @@
function prepareForExport(doc, _settings = settings) { function prepareForExport(doc, settings = settings) {
let states = JSON.parse(JSON.stringify(doc.states)); let states = JSON.parse(JSON.stringify(doc.states));
states.forEach(state => { states.forEach(state => {
@ -37,9 +37,13 @@ function prepareForExport(doc, _settings = settings) {
delete _doc.lastSavedHash; delete _doc.lastSavedHash;
delete _doc.element; delete _doc.element;
const _settings = JSON.parse(JSON.stringify(settings));
delete _settings.colors.getColor;
return { return {
document: _doc, document: _doc,
_settings, settings: _settings,
}; };
} }
@ -91,8 +95,8 @@ function parseFromJson(json) {
function importFromJson(json) { function importFromJson(json) {
const doc = parseFromJson(json); const doc = parseFromJson(json);
addDocument(doc); addDocument(doc.document);
switchDocument(doc); switchDocument(doc.document);
} }
function exportToFile() { function exportToFile() {
@ -109,9 +113,7 @@ function exportToFile() {
function downloadFile(name, content, type) { function downloadFile(name, content, type) {
const element = document.createElement('a'); const element = document.createElement('a');
console.log(content); element.setAttribute('href', `data:${type};base64,${btoa(content)}`);
element.setAttribute('href', `data:${type},charset=utf-8,${content}`);
element.setAttribute('download', name); element.setAttribute('download', name);
element.style.display = 'none'; element.style.display = 'none';
@ -157,4 +159,4 @@ function openFromLocalStorage(id) {
const entry = getLocalStorageEntries().find(entry => entry.document.id === id); const entry = getLocalStorageEntries().find(entry => entry.document.id === id);
addDocument(entry.document); addDocument(entry.document);
switchDocument(entry.document); switchDocument(entry.document);
} }

14
js/menu.js
View File

@ -23,10 +23,8 @@ modalSave.addFooterBtn('Speichern', 'btn', () => {
const modalOpen = new tingle.modal({ const modalOpen = new tingle.modal({
beforeOpen: () => { beforeOpen: () => {
const entries = getLocalStorageEntries().sort((a, b) => { const entries = getLocalStorageEntries().sort((a, b) => {
console.log(a, b);
return b.document.createdAt - a.document.createdAt return b.document.createdAt - a.document.createdAt
}); });
console.log(entries);
let html = '<h3>Gespeicherte Dokumente</h3><ul class="file-list">'; let html = '<h3>Gespeicherte Dokumente</h3><ul class="file-list">';
entries.forEach(entry => html += `<li class="file-list-item" data-id="${entry.document.id}">${entry.document.name} (${new Date(entry.document.createdAt).toLocaleString()})</li>`); entries.forEach(entry => html += `<li class="file-list-item" data-id="${entry.document.id}">${entry.document.name} (${new Date(entry.document.createdAt).toLocaleString()})</li>`);
html += '</ul>'; html += '</ul>';
@ -70,16 +68,20 @@ modalImport.setContent('<h3>Dokument importieren</h3><label for="importUpload" c
modalImport.addFooterBtn('Laden', 'btn', () => { modalImport.addFooterBtn('Laden', 'btn', () => {
const el = document.getElementById('importUpload'); const el = document.getElementById('importUpload');
const file = el.files[0]; const file = el.files[0];
console.log(file);
if(file) { if(file) {
const reader = new FileReader(); const reader = new FileReader();
// TODO: Check for file type etc.
reader.readAsText(file, 'UTF-8'); reader.readAsText(file, 'UTF-8');
reader.onload = (evt) => { reader.onload = (evt) => {
console.log(evt.target.result); const json = evt.target.result;
// TODO: Add error handling
importFromJson(json);
modalImport.close();
}; };
reader.onerror = (evt) => { reader.onerror = (evt) => {
console.log(evt); alert('Ein Fehler beim Einlesen der Datei ist aufgetreten. Womöglich muss hier ein Bug behoben werden... :(');
modalImport.close();
} }
} }
}); });
@ -106,4 +108,4 @@ document.getElementById('importBtn').addEventListener('click', () => {
document.getElementById('exportBtn').addEventListener('click', () => { document.getElementById('exportBtn').addEventListener('click', () => {
modalExport.open(); modalExport.open();
}); });

4
js/simulate.js
View File

@ -56,8 +56,6 @@ function simulationStep(input) {
possibilities.forEach(conn => { possibilities.forEach(conn => {
const conditions = conn.text.split(/, ?/g); const conditions = conn.text.split(/, ?/g);
console.log(conn, conditions);
if (input.match(new RegExp(conditions.join('|'), 'g'))) { if (input.match(new RegExp(conditions.join('|'), 'g'))) {
if (conn instanceof Connection) { if (conn instanceof Connection) {
animations.push(new ConnectionAnimation(conn)); animations.push(new ConnectionAnimation(conn));
@ -218,4 +216,4 @@ class SelfConnectionAnimation {
function easeInOutCubic(t) { function easeInOutCubic(t) {
return t < .5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1 return t < .5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1
} }