From eede80f1e6e1c167c1a15888798afa3793c74fe2 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Sun, 13 Oct 2019 22:47:38 +0200
Subject: [PATCH] Clear verifier root element
---
.../META-INF/resources/js/dmnVerifier.js | 4 ++++
.../resources/META-INF/resources/js/dmnViewer.js | 12 +++---------
.../resources/META-INF/resources/js/upload.js | 15 +++++----------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
index 41255770..06fd1af0 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
@@ -11,6 +11,10 @@ function checkVerifications() {
getVerifications();
}
+function cleanDmnVerifierRoot() {
+ $('#root-dmn-verifier').empty();
+}
+
function getVerifications() {
dmnModeler.saveXML({format: true}, function (err, xml) {
if (err) {
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
index a0beb7a5..71e766c4 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
@@ -52,15 +52,7 @@ function exportDiagram() {
} else {
console.log('saving dmn..');
}
- $.ajax({
- url: dmnApi + 'setCurrentDmn',
- type: 'POST',
- contentType: 'text/xml',
- data: xml,
- success: function (data) {
- console.log('dmn saved');
- }
- });
+ // TODO, download
});
}
@@ -70,6 +62,8 @@ function exportDiagram() {
* @param {String} dmnXML diagram to display
*/
function openDiagram(dmnXML) {
+ // clean
+ cleanDmnVerifierRoot();
// import diagram
dmnModeler.importXML(dmnXML, function (err) {
if (err) {
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js
index 14b4cb96..9cdc772b 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js
@@ -1,18 +1,13 @@
-console.log("TEST");
-
document.addEventListener("DOMContentLoaded", function () {
- // Falls neue Eingabe, neuer Aufruf der Auswahlfunktion
- document.getElementById('dmn-file-upload').addEventListener('change',
- loadDmnFromFile,
- false);
+ $('#dmn-file-upload').on('change', loadDmnFromFile);
});
function loadDmnFromFile(evt) {
- var files = evt.target.files;
- var dmnFile = files[0];
- var fileReader = new FileReader();
+ let files = evt.target.files;
+ let dmnFile = files[0];
+ let fileReader = new FileReader();
fileReader.onload = function (fileLoadedEvent) {
- var textFromFileLoaded = fileLoadedEvent.target.result;
+ let textFromFileLoaded = fileLoadedEvent.target.result;
openDiagram(textFromFileLoaded);
};
fileReader.readAsText(dmnFile, "UTF-8");
--
GitLab